diff options
| author | Melanie | 2010-12-03 02:36:13 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-03 02:36:13 +0000 |
| commit | 342dc532ec64642d5997f23050a9776f663facdf (patch) | |
| tree | b0be3997967aa6e4d79873281f535ad436b841e4 /bin/OpenSim.exe.config | |
| parent | Change the way sim health reporting reports sim startup (diff) | |
| parent | Only force prim persistence before delete if the prim is the result of an unp... (diff) | |
| download | opensim-SC_OLD-342dc532ec64642d5997f23050a9776f663facdf.zip opensim-SC_OLD-342dc532ec64642d5997f23050a9776f663facdf.tar.gz opensim-SC_OLD-342dc532ec64642d5997f23050a9776f663facdf.tar.bz2 opensim-SC_OLD-342dc532ec64642d5997f23050a9776f663facdf.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Also prevent god takes from ending up in Lost and Found
Diffstat (limited to 'bin/OpenSim.exe.config')
| -rwxr-xr-x | bin/OpenSim.exe.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 3c7adf5..eece040 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
| @@ -13,6 +13,8 @@ | |||
| 13 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | 13 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> |
| 14 | <layout type="log4net.Layout.PatternLayout"> | 14 | <layout type="log4net.Layout.PatternLayout"> |
| 15 | <conversionPattern value="%date{HH:mm:ss} - %message" /> | 15 | <conversionPattern value="%date{HH:mm:ss} - %message" /> |
| 16 | <!-- console log with milliseconds. Useful for debugging --> | ||
| 17 | <!-- <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> --> | ||
| 16 | </layout> | 18 | </layout> |
| 17 | </appender> | 19 | </appender> |
| 18 | 20 | ||