diff options
| author | Spp <spp@jorge.gr> | 2012-10-30 10:30:05 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-30 10:30:05 +0100 |
| commit | c97fc99e1683edc4a5b177119ba7a775cf7a19a1 (patch) | |
| tree | 16007f950c058d3c6963e2924981d7bbe5a3c898 /src/server/shared/Logging | |
| parent | 59a828b49ed1e07bd5d705e3d3aa1a6d110be8fc (diff) | |
| parent | cd8e9dfb5213f6e299065cc1f87535a26c2f2936 (diff) | |
Merge branch 'master' into 4.3.4
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
Diffstat (limited to 'src/server/shared/Logging')
| -rw-r--r-- | src/server/shared/Logging/Appender.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Logging/Appender.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp index 348ec4b3c7c..0bfcc8abbd2 100644 --- a/src/server/shared/Logging/Appender.cpp +++ b/src/server/shared/Logging/Appender.cpp @@ -217,6 +217,8 @@ char const* Appender::getLogFilterTypeString(LogFilterType type) return "SERVER LOADING"; case LOG_FILTER_OPCODES: return "OPCODE"; + case LOG_FILTER_SOAP: + return "SOAP"; default: break; } diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h index 2d6145b14af..89d0016ce2b 100644 --- a/src/server/shared/Logging/Appender.h +++ b/src/server/shared/Logging/Appender.h @@ -66,10 +66,11 @@ enum LogFilterType LOG_FILTER_PLAYER_DUMP = 38, LOG_FILTER_BATTLEFIELD = 39, LOG_FILTER_SERVER_LOADING = 40, - LOG_FILTER_OPCODES = 41 + LOG_FILTER_OPCODES = 41, + LOG_FILTER_SOAP = 42 }; -const uint8 MaxLogFilter = uint8(LOG_FILTER_OPCODES) + 1; +const uint8 MaxLogFilter = 43; // Values assigned have their equivalent in enum ACE_Log_Priority enum LogLevel |