diff options
| author | Melanie | 2009-10-19 21:58:51 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-19 21:58:51 +0100 |
| commit | ffd59868f5e2d797160b1bbfc13f3b4bac717b36 (patch) | |
| tree | fb807a129a6e449ac17dadce15d7b27268c92c3f /OpenSim/Framework/BlockingQueue.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Minor formatting cleanup. (diff) | |
| download | opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.zip opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.gz opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.bz2 opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Framework/BlockingQueue.cs')
| -rw-r--r-- | OpenSim/Framework/BlockingQueue.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index 857930a..3658161 100644 --- a/OpenSim/Framework/BlockingQueue.cs +++ b/OpenSim/Framework/BlockingQueue.cs | |||
| @@ -67,8 +67,8 @@ namespace OpenSim.Framework | |||
| 67 | return m_pqueue.Dequeue(); | 67 | return m_pqueue.Dequeue(); |
| 68 | 68 | ||
| 69 | if (m_queue.Count > 0) | 69 | if (m_queue.Count > 0) |
| 70 | return m_queue.Dequeue(); | 70 | return m_queue.Dequeue(); |
| 71 | return default(T); | 71 | return default(T); |
| 72 | } | 72 | } |
| 73 | } | 73 | } |
| 74 | 74 | ||
| @@ -121,7 +121,7 @@ namespace OpenSim.Framework | |||
| 121 | { | 121 | { |
| 122 | m_pqueue.Clear(); | 122 | m_pqueue.Clear(); |
| 123 | m_queue.Clear(); | 123 | m_queue.Clear(); |
| 124 | Monitor.Pulse(m_queueSync); | 124 | Monitor.Pulse(m_queueSync); |
| 125 | } | 125 | } |
| 126 | } | 126 | } |
| 127 | } | 127 | } |