aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/BlockingQueue.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-18 12:23:27 -0700
committerDiva Canto2013-07-18 12:23:27 -0700
commit9e35b069a43942285214ff485c8f5ffb53e7c5ec (patch)
tree7f58d5277f530be8e1286c856d5aecef80126f9e /OpenSim/Framework/BlockingQueue.cs
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
downloadopensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.zip
opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.gz
opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.bz2
opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.xz
Reverting the reverts I did yesterday. cpu-branch has now been
successfully tested, and I'm merging back those changes, which proved to be good. Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"" This reverts commit fa2370b32ee57a07f27501152c3c705a883b13d8.
Diffstat (limited to '')
-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 aef1192..e607e64 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 if (m_queue.Count < 1 && m_pqueue.Count < 1) 79 while (m_queue.Count < 1 && m_pqueue.Count < 1)
80 { 80 {
81 Monitor.Wait(m_queueSync, msTimeout); 81 Monitor.Wait(m_queueSync, msTimeout);
82 } 82 }