diff options
| author | Melanie | 2009-12-20 16:45:28 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-20 16:45:28 +0000 |
| commit | 3d3e0ea4f38b343edc19b7530fbac28b84b53ecf (patch) | |
| tree | b22a6e71dca45c15f98df996182239186259b6d3 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'casper' (diff) | |
| parent | Fix a case where an idle sim can eat 100% of a core (diff) | |
| download | opensim-SC_OLD-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.zip opensim-SC_OLD-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.gz opensim-SC_OLD-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.bz2 opensim-SC_OLD-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 20cae5d..265129c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1328,7 +1328,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1328 | maintc = Util.EnvironmentTickCountSubtract(maintc); | 1328 | maintc = Util.EnvironmentTickCountSubtract(maintc); |
| 1329 | maintc = (int)(m_timespan * 1000) - maintc; | 1329 | maintc = (int)(m_timespan * 1000) - maintc; |
| 1330 | 1330 | ||
| 1331 | if ((maintc < (m_timespan * 1000)) && maintc > 0) | 1331 | if (maintc > 0) |
| 1332 | Thread.Sleep(maintc); | 1332 | Thread.Sleep(maintc); |
| 1333 | 1333 | ||
| 1334 | // Tell the watchdog that this thread is still alive | 1334 | // Tell the watchdog that this thread is still alive |