From 5a78161e74116050b063ec679e1c134ad4a2f16e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 19 Feb 2011 01:32:20 +0100
Subject: Restore heartbeat thread

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

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d4bfd46..2815f29 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1220,10 +1220,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                Update();
-
-                m_lastUpdate = Util.EnvironmentTickCount();
-                m_firstHeartbeat = false;
+                while (!shuttingdown)
+                    Update();
             }
             catch (ThreadAbortException)
             {
@@ -1410,7 +1408,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Tell the watchdog that this thread is still alive
             Watchdog.UpdateThread();
-        }        
+        }
 
         public void AddGroupTarget(SceneObjectGroup grp)
         {
-- 
cgit v1.1