diff options
author | BlueWall | 2012-06-16 06:29:49 -0400 |
---|---|---|
committer | BlueWall | 2012-06-16 06:29:49 -0400 |
commit | fc1522ab609f69e198806b2b4bf730a61b1a4f0a (patch) | |
tree | a647a53415c3cdf10bb8bee6275ad11a5b85af7b /OpenSim | |
parent | Adjust Robust*.ini.examples V3 webprofile entries (diff) | |
parent | Change read config paramter from max_urls_per_simulator to max_external_urls_... (diff) | |
download | opensim-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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 9 |
2 files changed, 9 insertions, 4 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() |