diff options
| author | Melanie Thielker | 2017-03-31 14:50:14 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2017-03-31 14:50:14 +0100 |
| commit | 5587ee45005bd99ee01cefd8fb3ae3f2b91bf284 (patch) | |
| tree | 2863324dc4f7832d60c22118268b8a432fb7c1bf /bin/OpenSim.exe.config | |
| parent | add CanSellObject() permitions check functions (diff) | |
| parent | If a DNS resolution fails on an outbound request, simply allow it (diff) | |
| download | opensim-SC-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.zip opensim-SC-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.gz opensim-SC-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.bz2 opensim-SC-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.xz | |
Merge branch 'melanie'
Diffstat (limited to 'bin/OpenSim.exe.config')
| -rwxr-xr-x | bin/OpenSim.exe.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index b01191e..f1bf8a0 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
| @@ -39,7 +39,8 @@ | |||
| 39 | <acceptOnMatch value="false"/> | 39 | <acceptOnMatch value="false"/> |
| 40 | </filter> | 40 | </filter> |
| 41 | <layout type="log4net.Layout.PatternLayout"> | 41 | <layout type="log4net.Layout.PatternLayout"> |
| 42 | <conversionPattern value="%date %-5level (%thread) - %logger %message%newline" /> | 42 | <!-- <conversionPattern value="%date %-5level (%thread) - %logger %message%newline" /> --> |
| 43 | <conversionPattern value="%date %-5level %message%newline" /> | ||
| 43 | </layout> | 44 | </layout> |
| 44 | </appender> | 45 | </appender> |
| 45 | 46 | ||