aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-16 03:32:47 +0100
committerJustin Clark-Casey (justincc)2012-06-16 03:32:47 +0100
commit22f25dfcab4a5c0d4df0a3df74a6337ab80c5ee8 (patch)
tree3f2a519afe398530e4974d2609cb59c1bfe027fd
parentAdd region name to UseCircuitCode log messages (diff)
downloadopensim-SC-22f25dfcab4a5c0d4df0a3df74a6337ab80c5ee8.zip
opensim-SC-22f25dfcab4a5c0d4df0a3df74a6337ab80c5ee8.tar.gz
opensim-SC-22f25dfcab4a5c0d4df0a3df74a6337ab80c5ee8.tar.bz2
opensim-SC-22f25dfcab4a5c0d4df0a3df74a6337ab80c5ee8.tar.xz
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.
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs9
-rw-r--r--bin/OpenSimDefaults.ini4
2 files changed, 11 insertions, 2 deletions
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
76 private Dictionary<string, UrlData> m_UrlMap = 76 private Dictionary<string, UrlData> m_UrlMap =
77 new Dictionary<string, UrlData>(); 77 new Dictionary<string, UrlData>();
78 78
79 79 /// <summary>
80 /// Maximum number of external urls that can be set up by this module.
81 /// </summary>
80 private int m_TotalUrls = 100; 82 private int m_TotalUrls = 100;
81 83
82 private uint https_port = 0; 84 private uint https_port = 0;
@@ -107,6 +109,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
107 { 109 {
108 https_port = (uint) config.Configs["Network"].GetInt("https_port",0); 110 https_port = (uint) config.Configs["Network"].GetInt("https_port",0);
109 } 111 }
112
113 IConfig llFunctionsConfig = config.Configs["LL-Functions"];
114
115 if (llFunctionsConfig != null)
116 m_TotalUrls = llFunctionsConfig.GetInt("max_urls_per_simulator", m_TotalUrls);
110 } 117 }
111 118
112 public void PostInitialise() 119 public void PostInitialise()
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1b8a4b6..ededdc05 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1168,7 +1168,9 @@
1168 ; Maximum number of llListen events we allow per script 1168 ; Maximum number of llListen events we allow per script
1169 ; Set this to 0 to have no limit imposed. 1169 ; Set this to 0 to have no limit imposed.
1170 max_listens_per_script = 64 1170 max_listens_per_script = 64
1171 1171
1172 ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
1173 max_external_urls_per_simulator = 100
1172 1174
1173[DataSnapshot] 1175[DataSnapshot]
1174 ; The following set of configs pertains to search. 1176 ; The following set of configs pertains to search.