Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs

@@ -129,9 +129,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             OSHttpResponse response
                 = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
 
-            byte[] buffer
+            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
-                = server.DoHTTPGruntWork(
-                    responsedata, new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
 
             response.SendChunked = false;
             response.ContentLength64 = buffer.Length;

OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs

@@ -76,7 +76,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         private Dictionary<string, UrlData> m_UrlMap =
                 new Dictionary<string, UrlData>();
 
-
+        /// <summary>
+        /// Maximum number of external urls that can be set up by this module.
+        /// </summary>
         private int m_TotalUrls = 100;
 
         private uint https_port = 0;
@@ -107,6 +109,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             {
                 https_port = (uint) config.Configs["Network"].GetInt("https_port",0);
             }
+
+            IConfig llFunctionsConfig = config.Configs["LL-Functions"];
+
+            if (llFunctionsConfig != null)
+                m_TotalUrls = llFunctionsConfig.GetInt("max_external_urls_per_simulator", m_TotalUrls);
         }
 
         public void PostInitialise()

bin/OpenSimDefaults.ini

@@ -1169,6 +1169,8 @@
     ; Set this to 0 to have no limit imposed.
     max_listens_per_script = 64
   
+    ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
+    max_external_urls_per_simulator = 100
 
 [DataSnapshot]
     ; The following set of configs pertains to search.