mirror of
https://github.com/opensim/opensim.git
synced 2026-08-01 06:06:06 +08:00
revert last commit which seems to conflict with DoubleQueue internals. The random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc
This commit is contained in:
@@ -254,13 +254,10 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
}
|
||||
}
|
||||
|
||||
lock (m_queue)
|
||||
{
|
||||
if (highPriority)
|
||||
m_queue.EnqueueHigh(reqinfo);
|
||||
else
|
||||
m_queue.EnqueueLow(reqinfo);
|
||||
}
|
||||
if (highPriority)
|
||||
m_queue.EnqueueHigh(reqinfo);
|
||||
else
|
||||
m_queue.EnqueueLow(reqinfo);
|
||||
};
|
||||
|
||||
NoEvents = (x, y) =>
|
||||
@@ -348,9 +345,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
{
|
||||
Watchdog.UpdateThread();
|
||||
|
||||
aPollRequest poolreq = null;
|
||||
lock (m_queue)
|
||||
poolreq = m_queue.Dequeue();
|
||||
aPollRequest poolreq = m_queue.Dequeue();
|
||||
|
||||
if (poolreq != null && poolreq.thepoll != null)
|
||||
poolreq.thepoll.Process(poolreq);
|
||||
|
||||
Reference in New Issue
Block a user