diff options
| author | Tom Grimshaw | 2010-07-01 09:47:18 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-01 09:47:18 -0700 |
| commit | 68281b356cea0ff92ae7d9484d663ea472d1be74 (patch) | |
| tree | 108b5d48164e195fce67321aa8afdeada146b19b /OpenSim/Region/CoreModules/Scripting | |
| parent | Cache all assets on upload so that the client can still retrieve the asset if... (diff) | |
| parent | ANother stab at LSL compatibility (diff) | |
| download | opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.zip opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.gz opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.bz2 opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -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 9b565ed..f8cb414 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
| @@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
| 142 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); | 142 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); |
| 143 | return urlcode; | 143 | return urlcode; |
| 144 | } | 144 | } |
| 145 | string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/"; | 145 | string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString(); |
| 146 | 146 | ||
| 147 | UrlData urlData = new UrlData(); | 147 | UrlData urlData = new UrlData(); |
| 148 | urlData.hostID = host.UUID; | 148 | urlData.hostID = host.UUID; |
| @@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
| 155 | 155 | ||
| 156 | m_UrlMap[url] = urlData; | 156 | m_UrlMap[url] = urlData; |
| 157 | 157 | ||
| 158 | string uri = "/lslhttp/" + urlcode.ToString() + "/"; | 158 | string uri = "/lslhttp/" + urlcode.ToString(); |
| 159 | 159 | ||
| 160 | m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll, | 160 | m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll, |
| 161 | new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents, | 161 | new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents, |