diff options
author | Melanie | 2013-03-03 13:24:37 +0000 |
---|---|---|
committer | Melanie | 2013-03-03 13:24:37 +0000 |
commit | f39e4abf0ed67e3101286651f7a5efdf7140e4e4 (patch) | |
tree | a5e30b220b66136ec3812db84d962d54193944a8 /OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Make Keyframe motion cross regions again (diff) | |
download | opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.zip opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.gz opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.bz2 opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index ffb8e85..f2922d6 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -50,6 +50,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
50 | public string url; | 50 | public string url; |
51 | public UUID urlcode; | 51 | public UUID urlcode; |
52 | public Dictionary<UUID, RequestData> requests; | 52 | public Dictionary<UUID, RequestData> requests; |
53 | public bool isSsl; | ||
53 | } | 54 | } |
54 | 55 | ||
55 | public class RequestData | 56 | public class RequestData |
@@ -195,6 +196,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
195 | urlData.engine = engine; | 196 | urlData.engine = engine; |
196 | urlData.url = url; | 197 | urlData.url = url; |
197 | urlData.urlcode = urlcode; | 198 | urlData.urlcode = urlcode; |
199 | urlData.isSsl = false; | ||
198 | urlData.requests = new Dictionary<UUID, RequestData>(); | 200 | urlData.requests = new Dictionary<UUID, RequestData>(); |
199 | 201 | ||
200 | m_UrlMap[url] = urlData; | 202 | m_UrlMap[url] = urlData; |
@@ -240,6 +242,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
240 | urlData.engine = engine; | 242 | urlData.engine = engine; |
241 | urlData.url = url; | 243 | urlData.url = url; |
242 | urlData.urlcode = urlcode; | 244 | urlData.urlcode = urlcode; |
245 | urlData.isSsl = true; | ||
243 | urlData.requests = new Dictionary<UUID, RequestData>(); | 246 | urlData.requests = new Dictionary<UUID, RequestData>(); |
244 | 247 | ||
245 | 248 | ||
@@ -421,7 +424,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
421 | 424 | ||
422 | private void RemoveUrl(UrlData data) | 425 | private void RemoveUrl(UrlData data) |
423 | { | 426 | { |
424 | m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/"); | 427 | if (data.isSsl) |
428 | m_HttpsServer.RemoveHTTPHandler("", "/lslhttps/"+data.urlcode.ToString()+"/"); | ||
429 | else | ||
430 | m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/"); | ||
425 | } | 431 | } |
426 | 432 | ||
427 | private Hashtable NoEvents(UUID requestID, UUID sessionID) | 433 | private Hashtable NoEvents(UUID requestID, UUID sessionID) |