diff options
| author | UbitUmarov | 2014-07-24 05:37:56 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-07-24 05:37:56 +0100 |
| commit | 05d071a4308219fe4e69744418ee8299efdfe1f2 (patch) | |
| tree | 6418056f8e16fcf2f8ff16a660800067ce41cae2 /OpenSim/Framework | |
| parent | revert my change of not adding physcis to a failed avatar transfer. This (diff) | |
| download | opensim-SC_OLD-05d071a4308219fe4e69744418ee8299efdfe1f2.zip opensim-SC_OLD-05d071a4308219fe4e69744418ee8299efdfe1f2.tar.gz opensim-SC_OLD-05d071a4308219fe4e69744418ee8299efdfe1f2.tar.bz2 opensim-SC_OLD-05d071a4308219fe4e69744418ee8299efdfe1f2.tar.xz | |
let BlockingQueue timeout work as its suposed to and not wait for ever
Diffstat (limited to '')
| -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 3e90fac..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 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) |