aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2012-06-16 06:29:49 -0400
committerBlueWall2012-06-16 06:29:49 -0400
commitfc1522ab609f69e198806b2b4bf730a61b1a4f0a (patch)
treea647a53415c3cdf10bb8bee6275ad11a5b85af7b
parentAdjust Robust*.ini.examples V3 webprofile entries (diff)
parentChange read config paramter from max_urls_per_simulator to max_external_urls_... (diff)
downloadopensim-SC_OLD-fc1522ab609f69e198806b2b4bf730a61b1a4f0a.zip
opensim-SC_OLD-fc1522ab609f69e198806b2b4bf730a61b1a4f0a.tar.gz
opensim-SC_OLD-fc1522ab609f69e198806b2b4bf730a61b1a4f0a.tar.bz2
opensim-SC_OLD-fc1522ab609f69e198806b2b4bf730a61b1a4f0a.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs4
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs9
-rw-r--r--bin/OpenSimDefaults.ini4
3 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 2995421..35a8dee 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -129,9 +129,7 @@ namespace OpenSim.Framework.Servers.HttpServer
129 OSHttpResponse response 129 OSHttpResponse response
130 = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext); 130 = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
131 131
132 byte[] buffer 132 byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
133 = server.DoHTTPGruntWork(
134 responsedata, new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
135 133
136 response.SendChunked = false; 134 response.SendChunked = false;
137 response.ContentLength64 = buffer.Length; 135 response.ContentLength64 = buffer.Length;
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index d2cd163..61afc76 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_external_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.