aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-17 15:04:12 -0700
committerDiva Canto2013-07-17 15:04:12 -0700
commit5495df74436d6c0039a1500d979a964b003abfdf (patch)
treee60be7c15efbdcd9e79dc11742186d6164ce6367
parentRevert "I confuse myself. Let's try this variable name instead." (diff)
downloadopensim-SC_OLD-5495df74436d6c0039a1500d979a964b003abfdf.zip
opensim-SC_OLD-5495df74436d6c0039a1500d979a964b003abfdf.tar.gz
opensim-SC_OLD-5495df74436d6c0039a1500d979a964b003abfdf.tar.bz2
opensim-SC_OLD-5495df74436d6c0039a1500d979a964b003abfdf.tar.xz
Revert "Do the same trick that dahlia did for Dequeue(timeout)"
This reverts commit af792bc7f2504e9ccf1c8ae7568919785dc397c9.
-rw-r--r--OpenSim/Framework/BlockingQueue.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index fb74a24..aef1192 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,10 +76,9 @@ namespace OpenSim.Framework
76 { 76 {
77 lock (m_queueSync) 77 lock (m_queueSync)
78 { 78 {
79 bool timedout = false; 79 if (m_queue.Count < 1 && m_pqueue.Count < 1)
80 while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
81 { 80 {
82 timedout = Monitor.Wait(m_queueSync, msTimeout); 81 Monitor.Wait(m_queueSync, msTimeout);
83 } 82 }
84 83
85 if (m_pqueue.Count > 0) 84 if (m_pqueue.Count > 0)