diff options
| author | Melanie | 2012-01-31 20:53:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-31 20:53:49 +0000 |
| commit | 1b63b21a4db192cdfb24748be523dd53bbba47a9 (patch) | |
| tree | a9c45afd55fb652e35c9a703560c7e35af2cdfa6 /bin | |
| parent | Make parcel sale overlays work. No auction support. (diff) | |
| parent | Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl... (diff) | |
| download | opensim-SC_OLD-1b63b21a4db192cdfb24748be523dd53bbba47a9.zip opensim-SC_OLD-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.gz opensim-SC_OLD-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.bz2 opensim-SC_OLD-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSim.Tests.Torture.dll.config | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/bin/OpenSim.Tests.Torture.dll.config b/bin/OpenSim.Tests.Torture.dll.config new file mode 100644 index 0000000..a3f681d --- /dev/null +++ b/bin/OpenSim.Tests.Torture.dll.config | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8" ?> | ||
| 2 | <configuration> | ||
| 3 | <configSections> | ||
| 4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
| 5 | </configSections> | ||
| 6 | <runtime> | ||
| 7 | <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| 8 | <dependentAssembly> | ||
| 9 | <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" /> | ||
| 10 | <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" /> | ||
| 11 | <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" /> | ||
| 12 | <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" /> | ||
| 13 | </dependentAssembly> | ||
| 14 | </assemblyBinding> | ||
| 15 | </runtime> | ||
| 16 | <log4net> | ||
| 17 | <!-- A1 is set to be a ConsoleAppender --> | ||
| 18 | <appender name="A1" type="log4net.Appender.ConsoleAppender"> | ||
| 19 | |||
| 20 | <!-- A1 uses PatternLayout --> | ||
| 21 | <layout type="log4net.Layout.PatternLayout"> | ||
| 22 | <!-- Print the date in ISO 8601 format --> | ||
| 23 | <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" /> | ||
| 24 | </layout> | ||
| 25 | </appender> | ||
| 26 | |||
| 27 | <!-- Set root logger level to DEBUG and its only appender to A1 --> | ||
| 28 | <root> | ||
| 29 | <level value="DEBUG" /> | ||
| 30 | <appender-ref ref="A1" /> | ||
| 31 | </root> | ||
| 32 | </log4net> | ||
| 33 | </configuration> | ||