aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-09-10 13:17:50 +0100
committerUbitUmarov2015-09-10 13:17:50 +0100
commit2bd8fb6b5a79d51ae4d22d42481d5780d52bb5b9 (patch)
tree8e81b849d2c46d2f9c467713a5cf73d8fb7fe9da
parentremove a avn thing before it gets into core (diff)
downloadopensim-SC-2bd8fb6b5a79d51ae4d22d42481d5780d52bb5b9.zip
opensim-SC-2bd8fb6b5a79d51ae4d22d42481d5780d52bb5b9.tar.gz
opensim-SC-2bd8fb6b5a79d51ae4d22d42481d5780d52bb5b9.tar.bz2
opensim-SC-2bd8fb6b5a79d51ae4d22d42481d5780d52bb5b9.tar.xz
add a few terminating / in LSLhttp uris as core
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 1983fed..30e23a9 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -203,7 +203,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
203 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); 203 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
204 return urlcode; 204 return urlcode;
205 } 205 }
206 string url = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString(); 206 string url = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/";
207 207
208 UrlData urlData = new UrlData(); 208 UrlData urlData = new UrlData();
209 urlData.hostID = host.UUID; 209 urlData.hostID = host.UUID;
@@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
217 217
218 m_UrlMap[url] = urlData; 218 m_UrlMap[url] = urlData;
219 219
220 string uri = "/lslhttp/" + urlcode.ToString(); 220 string uri = "/lslhttp/" + urlcode.ToString() + "/";
221 221
222 PollServiceEventArgs args 222 PollServiceEventArgs args
223 = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000); 223 = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
@@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
251 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); 251 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
252 return urlcode; 252 return urlcode;
253 } 253 }
254 string url = "https://" + ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString(); 254 string url = "https://" + ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString() + "/";
255 255
256 UrlData urlData = new UrlData(); 256 UrlData urlData = new UrlData();
257 urlData.hostID = host.UUID; 257 urlData.hostID = host.UUID;
@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
265 265
266 m_UrlMap[url] = urlData; 266 m_UrlMap[url] = urlData;
267 267
268 string uri = "/lslhttps/" + urlcode.ToString(); 268 string uri = "/lslhttps/" + urlcode.ToString() + "/";
269 269
270 PollServiceEventArgs args 270 PollServiceEventArgs args
271 = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000); 271 = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);