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/CoreModules/World/WorldMap/WorldMapModule.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 00c8279..03a4d34 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -716,12 +716,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 while (true)
                 {
-                    Watchdog.UpdateThread();
-
                     av = null;
                     st = null;
 
-                    st = requests.Dequeue(4900); // timeout to make watchdog happy
+                    st = requests.Dequeue(4500);
+                    Watchdog.UpdateThread();
 
                     if (st == null || st.agentID == UUID.Zero)
                         continue;
@@ -1152,10 +1151,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 while(!m_mapBlockRequestEvent.WaitOne(4900))
                 {
+                    Watchdog.UpdateThread();
                     if(m_scene == null)
                         return;
                 }
-
+                Watchdog.UpdateThread();
                 lock (m_mapBlockRequestEvent)
                 {
                     int total = 0;
-- 
cgit v1.1