diff options
| author | Melanie | 2011-02-19 01:32:20 +0100 |
|---|---|---|
| committer | Melanie | 2011-02-19 01:32:20 +0100 |
| commit | 5a78161e74116050b063ec679e1c134ad4a2f16e (patch) | |
| tree | 64b1625a8d946a22526fd2bb44a89ff055122625 | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-5a78161e74116050b063ec679e1c134ad4a2f16e.zip opensim-SC-5a78161e74116050b063ec679e1c134ad4a2f16e.tar.gz opensim-SC-5a78161e74116050b063ec679e1c134ad4a2f16e.tar.bz2 opensim-SC-5a78161e74116050b063ec679e1c134ad4a2f16e.tar.xz | |
Restore heartbeat thread
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 3 insertions, 5 deletions
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 | |||
| 1220 | 1220 | ||
| 1221 | try | 1221 | try |
| 1222 | { | 1222 | { |
| 1223 | Update(); | 1223 | while (!shuttingdown) |
| 1224 | 1224 | Update(); | |
| 1225 | m_lastUpdate = Util.EnvironmentTickCount(); | ||
| 1226 | m_firstHeartbeat = false; | ||
| 1227 | } | 1225 | } |
| 1228 | catch (ThreadAbortException) | 1226 | catch (ThreadAbortException) |
| 1229 | { | 1227 | { |
| @@ -1410,7 +1408,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1410 | 1408 | ||
| 1411 | // Tell the watchdog that this thread is still alive | 1409 | // Tell the watchdog that this thread is still alive |
| 1412 | Watchdog.UpdateThread(); | 1410 | Watchdog.UpdateThread(); |
| 1413 | } | 1411 | } |
| 1414 | 1412 | ||
| 1415 | public void AddGroupTarget(SceneObjectGroup grp) | 1413 | public void AddGroupTarget(SceneObjectGroup grp) |
| 1416 | { | 1414 | { |