aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2009-10-14 23:31:38 +0100
committerMelanie2009-10-14 23:31:38 +0100
commit6bdd6ae0a0ec60dfe1e0646d62c52348a967f444 (patch)
treef244ae59274d787bb20ac87bf181de078a3d1e55 /bin
parent* Clean up the SetThrottle() code and add a maxBurstRate parameter to allow m... (diff)
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-6bdd6ae0a0ec60dfe1e0646d62c52348a967f444.zip
opensim-SC_OLD-6bdd6ae0a0ec60dfe1e0646d62c52348a967f444.tar.gz
opensim-SC_OLD-6bdd6ae0a0ec60dfe1e0646d62c52348a967f444.tar.bz2
opensim-SC_OLD-6bdd6ae0a0ec60dfe1e0646d62c52348a967f444.tar.xz
Merge branch 'master' into htb-throttle
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config33
1 files changed, 0 insertions, 33 deletions
diff --git a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config b/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
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>