diff options
author | Melanie | 2012-07-05 23:09:20 +0200 |
---|---|---|
committer | Melanie | 2012-07-05 23:09:20 +0200 |
commit | 4854d779041e987ae13de4f30a37e4fab1b7a3d7 (patch) | |
tree | 6e05bd38feb13797c5137d70a13e4e09bfe94745 /OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |
parent | use the pollEvent timeout paramenter on pooling (diff) | |
download | opensim-SC_OLD-4854d779041e987ae13de4f30a37e4fab1b7a3d7.zip opensim-SC_OLD-4854d779041e987ae13de4f30a37e4fab1b7a3d7.tar.gz opensim-SC_OLD-4854d779041e987ae13de4f30a37e4fab1b7a3d7.tar.bz2 opensim-SC_OLD-4854d779041e987ae13de4f30a37e4fab1b7a3d7.tar.xz |
Add an EventType enum and Type field to the poll service event args. This allows
the manager to tell what type of event it is. All events except for lsl http in
go to the "slow queue" which is run once per second as before.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 8 |
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 e93266c..9c5596b 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -172,9 +172,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
172 | 172 | ||
173 | string uri = "/lslhttp/" + urlcode.ToString(); | 173 | string uri = "/lslhttp/" + urlcode.ToString(); |
174 | 174 | ||
175 | m_HttpServer.AddPollServiceHTTPHandler( | 175 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
176 | uri, | 176 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
177 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000)); | 177 | m_HttpServer.AddPollServiceHTTPHandler(uri, args); |
178 | 178 | ||
179 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); | 179 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); |
180 | } | 180 | } |
@@ -422,7 +422,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
422 | } | 422 | } |
423 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) | 423 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) |
424 | { | 424 | { |
425 | UrlData url = null; | 425 | UrlData url = null; |
426 | RequestData requestData = null; | 426 | RequestData requestData = null; |
427 | 427 | ||
428 | lock (m_RequestMap) | 428 | lock (m_RequestMap) |