diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 4 |
2 files changed, 4 insertions, 4 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 7dd9770..7e6b027 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -156,12 +156,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
156 | private Scene m_scene; | 156 | private Scene m_scene; |
157 | 157 | ||
158 | public PollServiceInventoryEventArgs(Scene scene, UUID pId) : | 158 | public PollServiceInventoryEventArgs(Scene scene, UUID pId) : |
159 | base(null, null, null, null, pId) | 159 | base(null, null, null, null, pId, int.MaxValue) |
160 | { | 160 | { |
161 | m_scene = scene; | 161 | m_scene = scene; |
162 | 162 | ||
163 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; | 163 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; |
164 | GetEvents = (x, y, z) => | 164 | GetEvents = (x, y) => |
165 | { | 165 | { |
166 | lock (responses) | 166 | lock (responses) |
167 | { | 167 | { |