diff options
| author | Justin Clark-Casey (justincc) | 2012-03-23 00:54:37 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-23 00:55:11 +0000 |
| commit | 08b8ebcc7e71038894fa47757db6d6aa5bb66d00 (patch) | |
| tree | 189e03e0dfcd5beb9a0263d6a484d1f8c2281f97 /OpenSim | |
| parent | Add commented out section on collisions switch in Scene.SetSceneCoreDebug(). (diff) | |
| download | opensim-SC_OLD-08b8ebcc7e71038894fa47757db6d6aa5bb66d00.zip opensim-SC_OLD-08b8ebcc7e71038894fa47757db6d6aa5bb66d00.tar.gz opensim-SC_OLD-08b8ebcc7e71038894fa47757db6d6aa5bb66d00.tar.bz2 opensim-SC_OLD-08b8ebcc7e71038894fa47757db6d6aa5bb66d00.tar.xz | |
Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpdate is no longer properly updated and is redundant anyway.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9d882c0..16ce1ba 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4504,8 +4504,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4504 | // | 4504 | // |
| 4505 | int health=1; // Start at 1, means we're up | 4505 | int health=1; // Start at 1, means we're up |
| 4506 | 4506 | ||
| 4507 | if ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000) | 4507 | if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) < 1000) |
| 4508 | health+=1; | 4508 | health += 1; |
| 4509 | else | 4509 | else |
| 4510 | return health; | 4510 | return health; |
| 4511 | 4511 | ||