diff options
author | Spp <spp@jorge.gr> | 2013-03-25 14:34:22 +0100 |
---|---|---|
committer | Spp <spp@jorge.gr> | 2013-03-25 14:34:22 +0100 |
commit | c97c381ea0b63963b3756f531b8c64636cb5d66b (patch) | |
tree | c5a99580d20b16b3eb957faab142b7761fefd507 /src/server/shared/Logging/Appender.cpp | |
parent | 132cc295ca7f1eeb29aaa1ff821faa47ef3478f9 (diff) | |
parent | 1a6a23ec96c7646d2753198f93eaba62d2732a83 (diff) |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Events/GameEventMgr.cpp
src/server/game/Loot/LootMgr.cpp
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/shared/Logging/Appender.cpp')
-rw-r--r-- | src/server/shared/Logging/Appender.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp index efb141d1060..cde94fe3a7c 100644 --- a/src/server/shared/Logging/Appender.cpp +++ b/src/server/shared/Logging/Appender.cpp @@ -218,6 +218,8 @@ char const* Appender::getLogFilterTypeString(LogFilterType type) return "SOAP"; case LOG_FILTER_RBAC: return "RBAC"; + case LOG_FILTER_CHEAT: + return "CHEAT"; default: break; } |