diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-16 00:36:50 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-16 00:36:50 +0100 |
| commit | b651b352ed26e13bf85948ee45219566889c585c (patch) | |
| tree | 6b8e4273b2e3d3aed765c8e86549acfe59fd5767 /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | 60e608417eee5ad1822592d226c9b2e65096f98c (diff) | |
| parent | 3c42401d662104145bf55a6550b432dd8a4428e2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/ConditionMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index d4668142b3b..7024f995ce7 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -926,7 +926,7 @@ void ConditionMgr::LoadConditions(bool isReload) } while (result->NextRow()); - sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u conditions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u conditions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); } |