diff options
author | Melanie | 2012-03-21 00:00:32 +0000 |
---|---|---|
committer | Melanie | 2012-03-21 00:00:32 +0000 |
commit | 5233e335e90b2ef8fc423cf9fe907134b164e652 (patch) | |
tree | 64ae6e84af0af8946b4afd28ac093ece3d556f15 /OpenSim/Region | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-5233e335e90b2ef8fc423cf9fe907134b164e652.zip opensim-SC_OLD-5233e335e90b2ef8fc423cf9fe907134b164e652.tar.gz opensim-SC_OLD-5233e335e90b2ef8fc423cf9fe907134b164e652.tar.bz2 opensim-SC_OLD-5233e335e90b2ef8fc423cf9fe907134b164e652.tar.xz |
Move the health monitoring stuff where it will do some good
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f9b89fb..44ee453 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1232,9 +1232,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1232 | 1232 | ||
1233 | while (!shuttingdown) | 1233 | while (!shuttingdown) |
1234 | Update(-1); | 1234 | Update(-1); |
1235 | |||
1236 | m_lastUpdate = Util.EnvironmentTickCount(); | ||
1237 | m_firstHeartbeat = false; | ||
1238 | } | 1235 | } |
1239 | finally | 1236 | finally |
1240 | { | 1237 | { |
@@ -1441,6 +1438,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1441 | if (maintc > 0) | 1438 | if (maintc > 0) |
1442 | Thread.Sleep(maintc); | 1439 | Thread.Sleep(maintc); |
1443 | 1440 | ||
1441 | m_lastUpdate = Util.EnvironmentTickCount(); | ||
1442 | m_firstHeartbeat = false; | ||
1443 | |||
1444 | // Optionally warn if a frame takes double the amount of time that it should. | 1444 | // Optionally warn if a frame takes double the amount of time that it should. |
1445 | // if (Util.EnvironmentTickCountSubtract(m_lastFrameTick, previousFrameTick) > (int)(MinFrameTime * 1000 * 2)) | 1445 | // if (Util.EnvironmentTickCountSubtract(m_lastFrameTick, previousFrameTick) > (int)(MinFrameTime * 1000 * 2)) |
1446 | // m_log.WarnFormat( | 1446 | // m_log.WarnFormat( |