From e913e1690e0e4a8da26103e1159d5ec6aedfb43b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 3 Dec 2010 07:16:06 +0100
Subject: Fix health reporting. This will now actually monitor the threads
 properly and not just the http server. It will also restart a dead heartbeat.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ae85605..ec1eda0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1213,9 +1213,6 @@ namespace OpenSim.Region.Framework.Scenes
             try
             {
                 Update();
-
-                m_lastUpdate = Util.EnvironmentTickCount();
-                m_firstHeartbeat = false;
             }
             catch (ThreadAbortException)
             {
@@ -1405,6 +1402,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // Tell the watchdog that this thread is still alive
                 Watchdog.UpdateThread();
+
+                m_lastUpdate = Util.EnvironmentTickCount();
+                m_firstHeartbeat = false;
             }
         }
 
-- 
cgit v1.1