From c5395cef7416d65e6459197973390adc826d7c36 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 27 Nov 2015 13:45:14 +0000
Subject: remove thread Heartbeat from watchdog

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2296981..7d98c94 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -531,11 +531,11 @@ namespace OpenSim.Region.Framework.Scenes
 //        private int m_lastUpdate;
         private bool m_firstHeartbeat = true;
         
-        private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
-        private bool m_reprioritizationEnabled = true;
-        private double m_reprioritizationInterval = 5000.0;
-        private double m_rootReprioritizationDistance = 10.0;
-        private double m_childReprioritizationDistance = 20.0;
+//        private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
+//        private bool m_reprioritizationEnabled = true;
+//        private double m_reprioritizationInterval = 5000.0;
+//        private double m_rootReprioritizationDistance = 10.0;
+//        private double m_childReprioritizationDistance = 20.0;
 
 
         private Timer m_mapGenerationTimer = new Timer();
@@ -1628,6 +1628,8 @@ namespace OpenSim.Region.Framework.Scenes
             Watchdog.GetCurrentThreadInfo().AlarmIfTimeout = true;
             m_lastFrameTick = Util.EnvironmentTickCount();
             Update(-1);
+
+            Watchdog.RemoveThread();
 		}
 
         private void Maintenance()
-- 
cgit v1.1