diff options
| author | Justin Clark-Casey (justincc) | 2013-07-18 01:23:33 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-18 01:23:33 +0100 |
| commit | 077be8b496f00c82353de02be192d2dcd920d6b3 (patch) | |
| tree | 3b5bc6943f70544423c20c7c22f4aa51acd5f3b7 /OpenSim/Framework | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-077be8b496f00c82353de02be192d2dcd920d6b3.zip opensim-SC_OLD-077be8b496f00c82353de02be192d2dcd920d6b3.tar.gz opensim-SC_OLD-077be8b496f00c82353de02be192d2dcd920d6b3.tar.bz2 opensim-SC_OLD-077be8b496f00c82353de02be192d2dcd920d6b3.tar.xz | |
Fix what apepars to be a bug in DoubleQueue<T>.Enqueue(Queue<T> q, T data) where the q parmater is ignored and everyghig is always placed on m_lowQueue.
No actual impact presently since nothing ends up calling EnqueueHigh()
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 8cfc4d4..a39d860 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -2253,7 +2253,7 @@ namespace OpenSim.Framework | |||
| 2253 | { | 2253 | { |
| 2254 | lock (m_syncRoot) | 2254 | lock (m_syncRoot) |
| 2255 | { | 2255 | { |
| 2256 | m_lowQueue.Enqueue(data); | 2256 | q.Enqueue(data); |
| 2257 | m_s.WaitOne(0); | 2257 | m_s.WaitOne(0); |
| 2258 | m_s.Release(); | 2258 | m_s.Release(); |
| 2259 | } | 2259 | } |