aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-07-17 15:03:40 -0700
committerDiva Canto2013-07-17 15:03:40 -0700
commit52dc7b2a96a28798d55d07d79d003ce5e3d35216 (patch)
tree945d648bc63917057ff6baf5e6091d5f5c843e9e /OpenSim
parentRevert "Now trying DoubleQueue instead of BlockingQueue for the PollServiceRe... (diff)
downloadopensim-SC_OLD-52dc7b2a96a28798d55d07d79d003ce5e3d35216.zip
opensim-SC_OLD-52dc7b2a96a28798d55d07d79d003ce5e3d35216.tar.gz
opensim-SC_OLD-52dc7b2a96a28798d55d07d79d003ce5e3d35216.tar.bz2
opensim-SC_OLD-52dc7b2a96a28798d55d07d79d003ce5e3d35216.tar.xz
Revert "I confuse myself. Let's try this variable name instead."
This reverts commit 1d3deda10cf85abd68a5f904d6698ae597a67cc0.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/BlockingQueue.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 3e90fac..fb74a24 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,10 +76,10 @@ namespace OpenSim.Framework
76 { 76 {
77 lock (m_queueSync) 77 lock (m_queueSync)
78 { 78 {
79 bool success = true; 79 bool timedout = false;
80 while (m_queue.Count < 1 && m_pqueue.Count < 1 && success) 80 while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
81 { 81 {
82 success = Monitor.Wait(m_queueSync, msTimeout); 82 timedout = Monitor.Wait(m_queueSync, msTimeout);
83 } 83 }
84 84
85 if (m_pqueue.Count > 0) 85 if (m_pqueue.Count > 0)