diff options
| author | Melanie | 2010-02-08 15:53:20 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-08 15:53:38 +0000 |
| commit | baaf660511214e52ea4ed20b8e80ec8e1ff06a3a (patch) | |
| tree | 1e90c7a22ea3354d6bfd5d2b3f8f64f199dbd477 /bin/OpenSim.exe.config | |
| parent | Added missing configs to Standalone.ini (diff) | |
| parent | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff) | |
| download | opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.zip opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.gz opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.bz2 opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.xz | |
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
Diffstat (limited to 'bin/OpenSim.exe.config')
| -rwxr-xr-x[-rw-r--r--] | 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 c2d93c0..3c7adf5 100644..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%newline" /> | 15 | <conversionPattern value="%date{HH:mm:ss} - %message" /> |
| 16 | </layout> | 16 | </layout> |
| 17 | </appender> | 17 | </appender> |
| 18 | 18 | ||