aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorUbitUmarov2017-05-25 01:28:02 +0100
committerUbitUmarov2017-05-25 01:28:02 +0100
commit9a1d94f455d9efcf5be8c298535470483ccba41e (patch)
tree917913f333ae0730a767d831e915fa0c7be17f4e /OpenSim/Region/ClientStack
parentadd a bit more pre exit cleanup (diff)
downloadopensim-SC_OLD-9a1d94f455d9efcf5be8c298535470483ccba41e.zip
opensim-SC_OLD-9a1d94f455d9efcf5be8c298535470483ccba41e.tar.gz
opensim-SC_OLD-9a1d94f455d9efcf5be8c298535470483ccba41e.tar.bz2
opensim-SC_OLD-9a1d94f455d9efcf5be8c298535470483ccba41e.tar.xz
remove use of libomv BlockingQueue
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 69ff713..0dd88ad 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -89,8 +89,8 @@ namespace OpenSim.Region.ClientStack.Linden
89 private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>(); 89 private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
90 private static Thread[] m_workerThreads = null; 90 private static Thread[] m_workerThreads = null;
91 private static int m_NumberScenes = 0; 91 private static int m_NumberScenes = 0;
92 private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = 92 private static OpenSim.Framework.BlockingQueue<aPollRequest> m_queue =
93 new OpenMetaverse.BlockingQueue<aPollRequest>(); 93 new OpenSim.Framework.BlockingQueue<aPollRequest>();
94 94
95 private Dictionary<UUID, PollServiceMeshEventArgs> m_pollservices = new Dictionary<UUID, PollServiceMeshEventArgs>(); 95 private Dictionary<UUID, PollServiceMeshEventArgs> m_pollservices = new Dictionary<UUID, PollServiceMeshEventArgs>();
96 96
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 0c20e04..b28a1d2 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -77,8 +77,8 @@ namespace OpenSim.Region.ClientStack.Linden
77 private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>(); 77 private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
78 private static Thread[] m_workerThreads = null; 78 private static Thread[] m_workerThreads = null;
79 private static int m_NumberScenes = 0; 79 private static int m_NumberScenes = 0;
80 private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = 80 private static OpenSim.Framework.BlockingQueue<aPollRequest> m_queue =
81 new OpenMetaverse.BlockingQueue<aPollRequest>(); 81 new OpenSim.Framework.BlockingQueue<aPollRequest>();
82 82
83 private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); 83 private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
84 84
@@ -263,7 +263,7 @@ namespace OpenSim.Region.ClientStack.Linden
263 { 263 {
264 if (responses.Count > 0) 264 if (responses.Count > 0)
265 { 265 {
266 if (m_queue.Count >= 4) 266 if (m_queue.Count() >= 4)
267 { 267 {
268 // Never allow more than 4 fetches to wait 268 // Never allow more than 4 fetches to wait
269 reqinfo.send503 = true; 269 reqinfo.send503 = true;