aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorDiva Canto2013-07-17 15:05:36 -0700
committerDiva Canto2013-07-17 15:05:36 -0700
commitfa2370b32ee57a07f27501152c3c705a883b13d8 (patch)
tree229303841ec7a044c3724e64a352d1d26505eb5c /OpenSim/Region/ClientStack
parentRevert "Didn't mean to commit this change in BlockingQueue.cs" (diff)
downloadopensim-SC_OLD-fa2370b32ee57a07f27501152c3c705a883b13d8.zip
opensim-SC_OLD-fa2370b32ee57a07f27501152c3c705a883b13d8.tar.gz
opensim-SC_OLD-fa2370b32ee57a07f27501152c3c705a883b13d8.tar.bz2
opensim-SC_OLD-fa2370b32ee57a07f27501152c3c705a883b13d8.tar.xz
Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"
This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index f0445ff..1835a72 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -364,7 +364,8 @@ namespace OpenSim.Region.ClientStack.Linden
364 364
365 caps.RegisterPollHandler( 365 caps.RegisterPollHandler(
366 "EventQueueGet", 366 "EventQueueGet",
367 new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000)); 367 new PollServiceEventArgs(
368 null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
368 369
369 Random rnd = new Random(Environment.TickCount); 370 Random rnd = new Random(Environment.TickCount);
370 lock (m_ids) 371 lock (m_ids)
@@ -382,10 +383,7 @@ namespace OpenSim.Region.ClientStack.Linden
382 Queue<OSD> queue = GetQueue(agentID); 383 Queue<OSD> queue = GetQueue(agentID);
383 if (queue != null) 384 if (queue != null)
384 lock (queue) 385 lock (queue)
385 {
386 //m_log.WarnFormat("POLLED FOR EVENTS BY {0} in {1} -- {2}", agentID, m_scene.RegionInfo.RegionName, queue.Count);
387 return queue.Count > 0; 386 return queue.Count > 0;
388 }
389 387
390 return false; 388 return false;
391 } 389 }
@@ -408,7 +406,7 @@ namespace OpenSim.Region.ClientStack.Linden
408 public Hashtable GetEvents(UUID requestID, UUID pAgentId) 406 public Hashtable GetEvents(UUID requestID, UUID pAgentId)
409 { 407 {
410 if (DebugLevel >= 2) 408 if (DebugLevel >= 2)
411 m_log.WarnFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName); 409 m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName);
412 410
413 Queue<OSD> queue = TryGetQueue(pAgentId); 411 Queue<OSD> queue = TryGetQueue(pAgentId);
414 OSD element; 412 OSD element;