bad merge?

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 65e9287..ed5a481 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -29,6 +29,7 @@ using Nini.Config;
 using log4net;
 using System.Reflection;
 using System;
+using System.Net;
 using System.Collections.Generic;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
@@ -53,6 +54,10 @@ namespace OpenSim.Server
 
         public static int Main(string[] args)
         {
+            // Make sure we don't get outbound connections queueing
+            ServicePointManager.DefaultConnectionLimit = 50;
+            ServicePointManager.UseNagleAlgorithm = false;
+
             m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
             
             string registryLocation;