aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/BlockingQueue.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-13 20:46:53 +0000
committerJustin Clarke Casey2009-03-13 20:46:53 +0000
commitc04e7cdf2b8f95534dafe7faedb29e1ff1af36c8 (patch)
treefc5a72b39ba72eee84afba4dc9ff315acbb0096f /OpenSim/Framework/BlockingQueue.cs
parent* Remove asset cache size and texture stat reports from ASSET STATS since the... (diff)
downloadopensim-SC_OLD-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.zip
opensim-SC_OLD-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.gz
opensim-SC_OLD-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.bz2
opensim-SC_OLD-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.xz
* Support loading empty folders in an iar
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/BlockingQueue.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 1815330..b99615a1 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Framework
65 65
66 if (m_pqueue.Count > 0) 66 if (m_pqueue.Count > 0)
67 return m_pqueue.Dequeue(); 67 return m_pqueue.Dequeue();
68
68 return m_queue.Dequeue(); 69 return m_queue.Dequeue();
69 } 70 }
70 } 71 }