OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge

avinationmerge
Melanie 2011-10-11 22:53:53 +01:00
parent d8b78ca498 839c1cdcc4
commit 308b6937ad
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@ -179,6 +179,7 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
Queue<OSD> queue = GetQueue(avatarID); Queue<OSD> queue = GetQueue(avatarID);
if (queue != null) if (queue != null)
lock (queue)
queue.Enqueue(ev); queue.Enqueue(ev);
} }
catch (NullReferenceException e) catch (NullReferenceException e)
@ -338,12 +339,8 @@ namespace OpenSim.Region.ClientStack.Linden
Queue<OSD> queue = GetQueue(agentID); Queue<OSD> queue = GetQueue(agentID);
if (queue != null) if (queue != null)
lock (queue) lock (queue)
{ return queue.Count > 0;
if (queue.Count > 0)
return true;
else
return false;
}
return false; return false;
} }
@ -358,8 +355,6 @@ namespace OpenSim.Region.ClientStack.Linden
element = queue.Dequeue(); // 15s timeout element = queue.Dequeue(); // 15s timeout
} }
int thisID = 0; int thisID = 0;
lock (m_ids) lock (m_ids)
thisID = m_ids[pAgentId]; thisID = m_ids[pAgentId];
@ -431,7 +426,10 @@ namespace OpenSim.Region.ClientStack.Linden
// } // }
Queue<OSD> queue = TryGetQueue(agentID); Queue<OSD> queue = TryGetQueue(agentID);
OSD element = queue.Dequeue(); // 15s timeout OSD element;
lock (queue)
element = queue.Dequeue(); // 15s timeout
Hashtable responsedata = new Hashtable(); Hashtable responsedata = new Hashtable();
@ -470,12 +468,16 @@ namespace OpenSim.Region.ClientStack.Linden
else else
{ {
array.Add(element); array.Add(element);
lock (queue)
{
while (queue.Count > 0) while (queue.Count > 0)
{ {
array.Add(queue.Dequeue()); array.Add(queue.Dequeue());
thisID++; thisID++;
} }
} }
}
OSDMap events = new OSDMap(); OSDMap events = new OSDMap();
events.Add("events", array); events.Add("events", array);
@ -520,6 +522,7 @@ namespace OpenSim.Region.ClientStack.Linden
AvatarID = m_QueueUUIDAvatarMapping[capUUID]; AvatarID = m_QueueUUIDAvatarMapping[capUUID];
} }
} }
if (AvatarID != UUID.Zero) if (AvatarID != UUID.Zero)
{ {
return ProcessQueue(request, AvatarID, m_scene.CapsModule.GetCapsForUser(AvatarID)); return ProcessQueue(request, AvatarID, m_scene.CapsModule.GetCapsForUser(AvatarID));