diff options
| author | Melanie | 2012-07-15 11:21:01 +0200 |
|---|---|---|
| committer | Melanie | 2012-07-15 11:21:01 +0200 |
| commit | 07b7301c22be2a89de56b5c13a5e30799106ae21 (patch) | |
| tree | e2cd9a3068ac484142336507408d672094a47b87 /OpenSim | |
| parent | Fix a double parenthesis typo (diff) | |
| download | opensim-SC-07b7301c22be2a89de56b5c13a5e30799106ae21.zip opensim-SC-07b7301c22be2a89de56b5c13a5e30799106ae21.tar.gz opensim-SC-07b7301c22be2a89de56b5c13a5e30799106ae21.tar.bz2 opensim-SC-07b7301c22be2a89de56b5c13a5e30799106ae21.tar.xz | |
Make https work in the poll service manager
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 6579f07..dcf49a7 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
| @@ -199,7 +199,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
| 199 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); | 199 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); |
| 200 | return urlcode; | 200 | return urlcode; |
| 201 | } | 201 | } |
| 202 | string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString() + "/"; | 202 | string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString(); |
| 203 | 203 | ||
| 204 | UrlData urlData = new UrlData(); | 204 | UrlData urlData = new UrlData(); |
| 205 | urlData.hostID = host.UUID; | 205 | urlData.hostID = host.UUID; |
| @@ -212,7 +212,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
| 212 | 212 | ||
| 213 | m_UrlMap[url] = urlData; | 213 | m_UrlMap[url] = urlData; |
| 214 | 214 | ||
| 215 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; | 215 | string uri = "/lslhttps/" + urlcode.ToString(); |
| 216 | 216 | ||
| 217 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); | 217 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
| 218 | args.Type = PollServiceEventArgs.EventType.LslHttp; | 218 | args.Type = PollServiceEventArgs.EventType.LslHttp; |