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.h | |
| 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.h')
| -rw-r--r-- | src/server/shared/Logging/Appender.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h index e11bc40c42f..983f6a5ddbe 100644 --- a/src/server/shared/Logging/Appender.h +++ b/src/server/shared/Logging/Appender.h @@ -68,10 +68,11 @@ enum LogFilterType LOG_FILTER_SERVER_LOADING = 40, LOG_FILTER_OPCODES = 41, LOG_FILTER_SOAP = 42, - LOG_FILTER_RBAC = 43 + LOG_FILTER_RBAC = 43, + LOG_FILTER_CHEAT = 44 }; -const uint8 MaxLogFilter = 43; +const uint8 MaxLogFilter = 45; // Values assigned have their equivalent in enum ACE_Log_Priority enum LogLevel @@ -108,12 +109,8 @@ enum AppenderFlags struct LogMessage { LogMessage(LogLevel _level, LogFilterType _type, std::string _text) - : level(_level) - , type(_type) - , text(_text) - { - mtime = time(NULL); - } + : level(_level), type(_type), text(_text), mtime(time(NULL)) + { } static std::string getTimeStr(time_t time); std::string getTimeStr(); |