diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-01 22:19:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-01 22:19:13 +0100 |
| commit | 2e1de60593fda0c1ad766fb0333a1992b17c35b9 (patch) | |
| tree | 90d942b50b5f43676391192d6e2e81ed7c513b5d /src/server/worldserver | |
| parent | d218afa19849e1be810bb06c96402cff956dc036 (diff) | |
| parent | a7dd289b04e3a9d0337fb5b6db3fc7a70f670933 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 499471ad823..5a9a1b86866 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -26,6 +26,7 @@ # CONSOLE AND REMOTE ACCESS # CHARACTER DELETE OPTIONS # CUSTOM SERVER OPTIONS +# LOGGING SYSTEM SETTINGS # ################################################################################################### @@ -2653,7 +2654,7 @@ PlayerDump.DisallowOverwrite = 1 ################################################################################################### # -# Logging system options. +# LOGGING SYSTEM SETTINGS # # Appender config values: Given a appender "name" # Appender.name @@ -2796,7 +2797,7 @@ Appenders=Console Server GM DBErrors Char RA Warden Chat # Logger.Root=0,5,Console Server -Logger.Chat=22,3,Chat +Logger.Chat=22,2,Chat Logger.DBErrors=26,5,Console Server DBErrors Logger.GM=27,3,Console Server GM Logger.RA=28,3,RA @@ -2817,3 +2818,6 @@ Logger.Opcodes=41,6,Console Server # Default: "Root Chat DBErrors GM RA Warden Character Load" Loggers=Root Chat DBErrors GM RA Warden Character Load WorldServer Opcodes + +# +###################################################################################################
\ No newline at end of file |