bad merge?

This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
406 changed files with 62562 additions and 8067 deletions

View File

@@ -76,10 +76,9 @@ namespace OpenSim.Framework
{
lock (m_queueSync)
{
bool success = true;
while (m_queue.Count < 1 && m_pqueue.Count < 1 && success)
if (m_queue.Count < 1 && m_pqueue.Count < 1)
{
success = Monitor.Wait(m_queueSync, msTimeout);
Monitor.Wait(m_queueSync, msTimeout);
}
if (m_pqueue.Count > 0)