diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-15 21:14:21 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-15 21:14:21 +0100 |
| commit | 9fcaeda0979c8f8ed5ff3ad55e260b14303bc971 (patch) | |
| tree | b57e5f9f6508cf18bd374c9f8fac0d91fa759508 /src/server/shared/Logging/Appender.h | |
| parent | 0289f2e1bbe667e059a8249896e35602e8d2ff37 (diff) | |
| parent | 52a5991c1258073d561e8b74ef99a7b940808d92 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/shared/Logging/Appender.h
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/shared/Logging/Appender.h')
| -rw-r--r-- | src/server/shared/Logging/Appender.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h index b95a72c6713..56662bbee15 100644 --- a/src/server/shared/Logging/Appender.h +++ b/src/server/shared/Logging/Appender.h @@ -63,10 +63,13 @@ enum LogFilterType LOG_FILTER_ARENAS, LOG_FILTER_SQL_DRIVER, LOG_FILTER_SQL_DEV, - LOG_FILTER_OPCODES + LOG_FILTER_PLAYER_DUMP, + LOG_FILTER_BATTLEFIELD, + LOG_FILTER_OPCODES, }; -const uint8 MaxLogFilter = uint8(LOG_FILTER_SQL_DEV) + 1; +const uint8 MaxLogFilter = uint8(LOG_FILTER_OPCODES) + 1; + // Values assigned have their equivalent in enum ACE_Log_Priority enum LogLevel @@ -106,7 +109,6 @@ struct LogMessage : level(_level) , type(_type) , text(_text) - , param1(0) { mtime = time(NULL); } @@ -118,7 +120,7 @@ struct LogMessage LogFilterType type; std::string text; std::string prefix; - uint32 param1; + std::string param1; time_t mtime; }; |