diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Framework/BlockingQueue.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Framework/BlockingQueue.cs')
| -rw-r--r-- | OpenSim/Framework/BlockingQueue.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index d11ad11..daf99a8 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 success = true; | 79 | if (m_queue.Count < 1 && m_pqueue.Count < 1) |
| 80 | while (m_queue.Count < 1 && m_pqueue.Count < 1 && success) | ||
| 81 | { | 80 | { |
| 82 | success = 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) |