aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-07-18 12:24:43 -0700
committerDiva Canto2013-07-18 12:24:43 -0700
commitad198a714ca4a659110b1aea2e7bb5dea34a7d13 (patch)
tree93591de9f9b40da72b92049ab5cd0a92dd54eafd /OpenSim
parentReverting the reverts I did yesterday. cpu-branch has now been (diff)
downloadopensim-SC_OLD-ad198a714ca4a659110b1aea2e7bb5dea34a7d13.zip
opensim-SC_OLD-ad198a714ca4a659110b1aea2e7bb5dea34a7d13.tar.gz
opensim-SC_OLD-ad198a714ca4a659110b1aea2e7bb5dea34a7d13.tar.bz2
opensim-SC_OLD-ad198a714ca4a659110b1aea2e7bb5dea34a7d13.tar.xz
Revert "Revert "Didn't mean to commit this change in BlockingQueue.cs""
This reverts commit fda91d93dad1fa6f901e8db5829aa8b70477c97e.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/BlockingQueue.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index e607e64..aef1192 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
76 { 76 {
77 lock (m_queueSync) 77 lock (m_queueSync)
78 { 78 {
79 while (m_queue.Count < 1 && m_pqueue.Count < 1) 79 if (m_queue.Count < 1 && m_pqueue.Count < 1)
80 { 80 {
81 Monitor.Wait(m_queueSync, msTimeout); 81 Monitor.Wait(m_queueSync, msTimeout);
82 } 82 }