aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Application/Application.cs2
-rw-r--r--OpenSim/Server/ServerMain.cs3
-rwxr-xr-xbin/OpenSim.exe.config7
-rw-r--r--bin/Robust.exe.config6
4 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 5cb6a88..7b9d35d 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -74,7 +74,7 @@ namespace OpenSim
74 AppDomain.CurrentDomain.UnhandledException += 74 AppDomain.CurrentDomain.UnhandledException +=
75 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); 75 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
76 76
77 ServicePointManager.DefaultConnectionLimit = 12; 77 ServicePointManager.DefaultConnectionLimit = 128;
78 ServicePointManager.UseNagleAlgorithm = false; 78 ServicePointManager.UseNagleAlgorithm = false;
79 79
80 // Add the arguments supplied when running the application to the configuration 80 // Add the arguments supplied when running the application to the configuration
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index c343044..74bb163 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -54,8 +54,7 @@ namespace OpenSim.Server
54 54
55 public static int Main(string[] args) 55 public static int Main(string[] args)
56 { 56 {
57 // Make sure we don't get outbound connections queueing 57 ServicePointManager.DefaultConnectionLimit = 4096;
58 ServicePointManager.DefaultConnectionLimit = 50;
59 ServicePointManager.UseNagleAlgorithm = false; 58 ServicePointManager.UseNagleAlgorithm = false;
60 59
61 m_Server = new HttpServerBase("R.O.B.U.S.T.", args); 60 m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 3f718d2..ba84d3b 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -8,6 +8,13 @@
8 </runtime> 8 </runtime>
9 <appSettings> 9 <appSettings>
10 </appSettings> 10 </appSettings>
11 <system.net>
12 <connectionManagement>
13 <clear />
14 <add address = "*" maxconnection = "32" />
15 </connectionManagement>
16 </system.net>
17
11 <log4net> 18 <log4net>
12 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 19 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
13 <filter type="log4net.Filter.LoggerMatchFilter"> 20 <filter type="log4net.Filter.LoggerMatchFilter">
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 025555e..fa4f467 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -8,6 +8,12 @@
8 </runtime> 8 </runtime>
9 <appSettings> 9 <appSettings>
10 </appSettings> 10 </appSettings>
11 <system.net>
12 <connectionManagement>
13 <clear />
14 <add address = "*" maxconnection = "64" />
15 </connectionManagement>
16 </system.net>
11 <log4net> 17 <log4net>
12 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 18 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
13 <filter type="log4net.Filter.LoggerMatchFilter"> 19 <filter type="log4net.Filter.LoggerMatchFilter">