Merge branch 'master' into httptests

2 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Server/Handlers/Land/LandHandlers.cs b/OpenSim/Server/Handlers/Land/LandHandlers.cs
index 150eaae..d74077a 100644
--- a/OpenSim/Server/Handlers/Land/LandHandlers.cs
+++ b/OpenSim/Server/Handlers/Land/LandHandlers.cs
@@ -85,6 +85,7 @@ namespace OpenSim.Server.Handlers.Land
                 hash["SnapshotID"] = landData.SnapshotID.ToString();
                 hash["UserLocation"] = landData.UserLocation.ToString();
                 hash["RegionAccess"] = regionAccess.ToString();
+                hash["Dwell"] = landData.Dwell.ToString();
             }
 
             XmlRpcResponse response = new XmlRpcResponse();
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 75aef5f..5e7e14f 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -76,8 +76,8 @@ namespace OpenSim.Server
 
         public static int Main(string[] args)
         {
-            // Make sure we don't get outbound connections queueing
-            ServicePointManager.DefaultConnectionLimit = 50;
+            ServicePointManager.DefaultConnectionLimit = 64;
+            ServicePointManager.Expect100Continue = false;
             ServicePointManager.UseNagleAlgorithm = false;
             ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate;