From 7a82c7c5b2a897ba1bd64c2badb71fe93c674246 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 26 May 2017 00:47:08 +0100
Subject: make BlockingQueue.Dequeue timeouts more coerent (just less than
 watchdog timeout)

---
 OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs         | 4 ++--
 OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs      | 4 ++--
 OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/ClientStack/Linden')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 03f0a04..a721454 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -204,10 +204,10 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             while(true)
             {
-                aPollRequest poolreq = m_queue.Dequeue(1000);
+                aPollRequest poolreq = m_queue.Dequeue(4500);
+                Watchdog.UpdateThread();
                 if(m_NumberScenes <= 0)
                     return;
-                Watchdog.UpdateThread();
                 if(poolreq.reqID != UUID.Zero)
                     poolreq.thepoll.Process(poolreq);
             }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 8ef943c..ce9798b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -415,10 +415,10 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             while (true)
             {
-                aPollRequest poolreq = m_queue.Dequeue(2000);
+                aPollRequest poolreq = m_queue.Dequeue(4500);
+                Watchdog.UpdateThread();
                 if(m_NumberScenes <= 0)
                     return;
-                Watchdog.UpdateThread();
                 if(poolreq.reqID != UUID.Zero)
                     poolreq.thepoll.Process(poolreq);
             }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 23ec141..a367426 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -443,10 +443,9 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             while (true)
             {
+                aPollRequest poolreq = m_queue.Dequeue(4500);
                 Watchdog.UpdateThread();
 
-                aPollRequest poolreq = m_queue.Dequeue(5000);
-
                 if (poolreq != null && poolreq.thepoll != null)
                 {
                     try
-- 
cgit v1.1