diff options
| author | Dan Lake | 2013-07-18 02:28:36 -0700 |
|---|---|---|
| committer | Dan Lake | 2013-07-18 02:28:36 -0700 |
| commit | ae997fffee31da6807e997351a16ba620b360331 (patch) | |
| tree | 2ea481b4111637604a9d79e7a588cfeaa5c7dc39 | |
| parent | Added MinPoolThreads to ini [Startup] section to control SmartThreadPool. (diff) | |
| parent | Fix what apepars to be a bug in DoubleQueue<T>.Enqueue(Queue<T> q, T data) wh... (diff) | |
| download | opensim-SC-ae997fffee31da6807e997351a16ba620b360331.zip opensim-SC-ae997fffee31da6807e997351a16ba620b360331.tar.gz opensim-SC-ae997fffee31da6807e997351a16ba620b360331.tar.bz2 opensim-SC-ae997fffee31da6807e997351a16ba620b360331.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
| -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 27100e6..6a15734 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -2255,7 +2255,7 @@ namespace OpenSim.Framework | |||
| 2255 | { | 2255 | { |
| 2256 | lock (m_syncRoot) | 2256 | lock (m_syncRoot) |
| 2257 | { | 2257 | { |
| 2258 | m_lowQueue.Enqueue(data); | 2258 | q.Enqueue(data); |
| 2259 | m_s.WaitOne(0); | 2259 | m_s.WaitOne(0); |
| 2260 | m_s.Release(); | 2260 | m_s.Release(); |
| 2261 | } | 2261 | } |