From 22f25dfcab4a5c0d4df0a3df74a6337ab80c5ee8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Jun 2012 03:32:47 +0100
Subject: Implement max_external_urls_per_simulator setting in [LL-Functions]
 to allow configuration of how many urls can be set up by llRequestURL()

Defaults remains as 100.
This setting is per simulator instead of per region due to how the url script module is structured.
---
 OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index d2cd163..77dfcc6 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/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_urls_per_simulator", m_TotalUrls);
         }
 
         public void PostInitialise()
-- 
cgit v1.1


From 7119de56ffb9c37b6baa57c5f30b81ac3f86c91c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Jun 2012 04:12:53 +0100
Subject: Change read config paramter from max_urls_per_simulator to
 max_external_urls_per_simulator, which is what it was meant to be

---
 OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 77dfcc6..61afc76 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             IConfig llFunctionsConfig = config.Configs["LL-Functions"];
 
             if (llFunctionsConfig != null)
-                m_TotalUrls = llFunctionsConfig.GetInt("max_urls_per_simulator", m_TotalUrls);
+                m_TotalUrls = llFunctionsConfig.GetInt("max_external_urls_per_simulator", m_TotalUrls);
         }
 
         public void PostInitialise()
-- 
cgit v1.1