aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.exe.config
diff options
context:
space:
mode:
authorMelanie2010-01-21 23:47:40 +0000
committerMelanie2010-01-21 23:47:40 +0000
commit946e06eb58bee7aaedf8b08c44a1e4cf2d63511e (patch)
tree5a142aa20973a787bc8353df5bd2027bc4984c10 /bin/OpenSim.exe.config
parentAdds example to OpenSim.ini.example for Admin Default Parcel settings (diff)
parentFixes llSetDamage. Patch from Revolution (diff)
downloadopensim-SC-946e06eb58bee7aaedf8b08c44a1e4cf2d63511e.zip
opensim-SC-946e06eb58bee7aaedf8b08c44a1e4cf2d63511e.tar.gz
opensim-SC-946e06eb58bee7aaedf8b08c44a1e4cf2d63511e.tar.bz2
opensim-SC-946e06eb58bee7aaedf8b08c44a1e4cf2d63511e.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'bin/OpenSim.exe.config')
-rwxr-xr-x[-rw-r--r--]bin/OpenSim.exe.config2
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