diff options
Diffstat (limited to 'OpenSim/Region')
3 files changed, 13 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index c7d4283..e73a04a 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -376,7 +376,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
376 | // TODO: Add EventQueueGet name/description for diagnostics | 376 | // TODO: Add EventQueueGet name/description for diagnostics |
377 | MainServer.Instance.AddPollServiceHTTPHandler( | 377 | MainServer.Instance.AddPollServiceHTTPHandler( |
378 | eventQueueGetPath, | 378 | eventQueueGetPath, |
379 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); | 379 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID, 40000)); |
380 | 380 | ||
381 | // m_log.DebugFormat( | 381 | // m_log.DebugFormat( |
382 | // "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}", | 382 | // "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}", |
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
418 | } | 418 | } |
419 | } | 419 | } |
420 | 420 | ||
421 | public Hashtable GetEvents(UUID requestID, UUID pAgentId, string request) | 421 | public Hashtable GetEvents(UUID requestID, UUID pAgentId) |
422 | { | 422 | { |
423 | if (DebugLevel >= 2) | 423 | if (DebugLevel >= 2) |
424 | m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName); | 424 | m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 2586cf0..d1afff2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -181,12 +181,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
181 | private Scene m_scene; | 181 | private Scene m_scene; |
182 | 182 | ||
183 | public PollServiceInventoryEventArgs(Scene scene, UUID pId) : | 183 | public PollServiceInventoryEventArgs(Scene scene, UUID pId) : |
184 | base(null, null, null, null, pId) | 184 | base(null, null, null, null, pId, int.MaxValue) |
185 | { | 185 | { |
186 | m_scene = scene; | 186 | m_scene = scene; |
187 | 187 | ||
188 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; | 188 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; |
189 | GetEvents = (x, y, z) => | 189 | GetEvents = (x, y) => |
190 | { | 190 | { |
191 | lock (responses) | 191 | lock (responses) |
192 | { | 192 | { |
@@ -316,6 +316,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
316 | // Register this as a poll service | 316 | // Register this as a poll service |
317 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID); | 317 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID); |
318 | 318 | ||
319 | args.Type = PollServiceEventArgs.EventType.Inventory; | ||
319 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | 320 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); |
320 | 321 | ||
321 | string hostName = m_scene.RegionInfo.ExternalHostName; | 322 | string hostName = m_scene.RegionInfo.ExternalHostName; |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index c9cd412..def8162 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -235,9 +235,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
235 | 235 | ||
236 | string uri = "/lslhttp/" + urlcode.ToString() + "/"; | 236 | string uri = "/lslhttp/" + urlcode.ToString() + "/"; |
237 | 237 | ||
238 | m_HttpServer.AddPollServiceHTTPHandler( | 238 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
239 | uri, | 239 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
240 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 240 | m_HttpServer.AddPollServiceHTTPHandler(uri, args); |
241 | 241 | ||
242 | m_log.DebugFormat( | 242 | m_log.DebugFormat( |
243 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", | 243 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", |
@@ -280,9 +280,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
280 | 280 | ||
281 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; | 281 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; |
282 | 282 | ||
283 | m_HttpsServer.AddPollServiceHTTPHandler( | 283 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
284 | uri, | 284 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
285 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 285 | m_HttpsServer.AddPollServiceHTTPHandler(uri, args); |
286 | 286 | ||
287 | m_log.DebugFormat( | 287 | m_log.DebugFormat( |
288 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", | 288 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", |
@@ -516,7 +516,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
516 | } | 516 | } |
517 | } | 517 | } |
518 | 518 | ||
519 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) | 519 | private Hashtable GetEvents(UUID requestID, UUID sessionID) |
520 | { | 520 | { |
521 | Hashtable response; | 521 | Hashtable response; |
522 | 522 | ||
@@ -668,4 +668,4 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
668 | ScriptRemoved(itemID); | 668 | ScriptRemoved(itemID); |
669 | } | 669 | } |
670 | } | 670 | } |
671 | } \ No newline at end of file | 671 | } |