diff options
| author | Melanie | 2012-06-21 01:10:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-21 01:10:13 +0100 |
| commit | eab211f94d33f9c77a63344072a79cb66707c0ff (patch) | |
| tree | 4ec906bf15a6738a1a2443ccc23f83c85ef3fa0b /bin/OpenSim.exe.config | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instea... (diff) | |
| download | opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.zip opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.gz opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.bz2 opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'bin/OpenSim.exe.config')
| -rwxr-xr-x | bin/OpenSim.exe.config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 4a49fc5..f1e3709 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
| @@ -31,5 +31,10 @@ | |||
| 31 | <appender-ref ref="Console" /> | 31 | <appender-ref ref="Console" /> |
| 32 | <appender-ref ref="LogFileAppender" /> | 32 | <appender-ref ref="LogFileAppender" /> |
| 33 | </root> | 33 | </root> |
| 34 | |||
| 35 | <logger name="OpenSim.Region.ScriptEngine.XEngine"> | ||
| 36 | <level value="WARN"/> | ||
| 37 | </logger> | ||
| 38 | |||
| 34 | </log4net> | 39 | </log4net> |
| 35 | </configuration> | 40 | </configuration> |