diff options
| author | UbitUmarov | 2017-05-14 07:52:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-14 07:52:50 +0100 |
| commit | eea247fcc5f29c767dc1e3b7f9a5616843256e8d (patch) | |
| tree | ec27d1c12890efa30a2a04edb32c4190e265ba54 /bin | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | clear land object on delete (diff) | |
| download | opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.zip opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.gz opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.bz2 opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rwxr-xr-x | bin/OpenSim.exe.config | 1 | ||||
| -rw-r--r-- | bin/Robust.exe.config | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 3f718d2..5be6989 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | </runtime> | 8 | </runtime> |
| 9 | <appSettings> | 9 | <appSettings> |
| 10 | </appSettings> | 10 | </appSettings> |
| 11 | |||
| 11 | <log4net> | 12 | <log4net> |
| 12 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | 13 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> |
| 13 | <filter type="log4net.Filter.LoggerMatchFilter"> | 14 | <filter type="log4net.Filter.LoggerMatchFilter"> |
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config index 025555e..3ad5f31 100644 --- a/bin/Robust.exe.config +++ b/bin/Robust.exe.config | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | </runtime> | 8 | </runtime> |
| 9 | <appSettings> | 9 | <appSettings> |
| 10 | </appSettings> | 10 | </appSettings> |
| 11 | |||
| 11 | <log4net> | 12 | <log4net> |
| 12 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | 13 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> |
| 13 | <filter type="log4net.Filter.LoggerMatchFilter"> | 14 | <filter type="log4net.Filter.LoggerMatchFilter"> |