diff options
author | Melanie | 2010-05-31 17:57:48 +0100 |
---|---|---|
committer | Melanie | 2010-05-31 17:57:48 +0100 |
commit | 0526a91206a64cb43be29d61d472a98f5a031b74 (patch) | |
tree | 061ab41ebe056e48794de5fd296c8af576471c1e /bin/OpenSim.exe.config | |
parent | Fix casting in llParcelMediaCommandList so that it actually, you know, works (diff) | |
parent | Fix a nullref in EventManager caused by RegionReady not setting the scene (diff) | |
download | opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.zip opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.gz opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.bz2 opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.xz |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'bin/OpenSim.exe.config')
-rwxr-xr-x | bin/OpenSim.exe.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 3c7adf5..4e7ef51 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
@@ -12,7 +12,7 @@ | |||
12 | <log4net> | 12 | <log4net> |
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,fff} - %message" /> |
16 | </layout> | 16 | </layout> |
17 | </appender> | 17 | </appender> |
18 | 18 | ||