diff options
author | Melanie | 2011-12-08 03:24:25 +0000 |
---|---|---|
committer | Melanie | 2011-12-08 03:24:25 +0000 |
commit | 50aa89dae66246395e9aac4d7d31f010e55473e8 (patch) | |
tree | b2d23662cc5a51e13f582728bf7064077f9edc32 /OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |
parent | Fix intersim object give messages (diff) | |
parent | Remove unused SceneManager.TryGetAvatarsScene() (diff) | |
download | opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.zip opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.gz opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.bz2 opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.xz |
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 458426b..f5683f0 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -91,11 +91,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
91 | get { return null; } | 91 | get { return null; } |
92 | } | 92 | } |
93 | 93 | ||
94 | private Hashtable HandleHttpPoll(Hashtable request) | ||
95 | { | ||
96 | return new Hashtable(); | ||
97 | } | ||
98 | |||
99 | public string Name | 94 | public string Name |
100 | { | 95 | { |
101 | get { return "UrlModule"; } | 96 | get { return "UrlModule"; } |
@@ -171,9 +166,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
171 | 166 | ||
172 | string uri = "/lslhttp/" + urlcode.ToString(); | 167 | string uri = "/lslhttp/" + urlcode.ToString(); |
173 | 168 | ||
174 | m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll, | 169 | m_HttpServer.AddPollServiceHTTPHandler( |
175 | new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents, | 170 | uri, |
176 | urlcode)); | 171 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); |
177 | 172 | ||
178 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); | 173 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); |
179 | } | 174 | } |
@@ -213,9 +208,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
213 | 208 | ||
214 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; | 209 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; |
215 | 210 | ||
216 | m_HttpsServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll, | 211 | m_HttpsServer.AddPollServiceHTTPHandler( |
217 | new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents, | 212 | uri, |
218 | urlcode)); | 213 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); |
219 | 214 | ||
220 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); | 215 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); |
221 | } | 216 | } |