diff options
| author | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
| commit | eb14e5a1756726b1f296591bb1ac385e4b1372d7 (patch) | |
| tree | 6a7e5e7489785729a2487a0245e0c7e3a9ee99bd /OpenSim/Framework/Util.cs | |
| parent | Add request received/handling stats for caps which are served by http poll ha... (diff) | |
| parent | Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt" (diff) | |
| download | opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.zip opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.gz opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.bz2 opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -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 cafe103..8cfc4d4 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -2293,7 +2293,7 @@ namespace OpenSim.Framework | |||
| 2293 | { | 2293 | { |
| 2294 | if (m_highQueue.Count > 0) | 2294 | if (m_highQueue.Count > 0) |
| 2295 | res = m_highQueue.Dequeue(); | 2295 | res = m_highQueue.Dequeue(); |
| 2296 | else | 2296 | else if (m_lowQueue.Count > 0) |
| 2297 | res = m_lowQueue.Dequeue(); | 2297 | res = m_lowQueue.Dequeue(); |
| 2298 | 2298 | ||
| 2299 | if (m_highQueue.Count == 0 && m_lowQueue.Count == 0) | 2299 | if (m_highQueue.Count == 0 && m_lowQueue.Count == 0) |