aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2009-12-20 16:44:31 +0000
committerMelanie2009-12-20 16:44:31 +0000
commit37b07aa9ec1d4bb9c84eebc5f9d99b4d70d6d05e (patch)
tree2be5bbcf0f79cafb37f7b6e071c58a9fb469098f /OpenSim/Region/Framework/Scenes
parent* Bug fix in HG: preserve the home region coordinates across multiple HG TPs. (diff)
downloadopensim-SC_OLD-37b07aa9ec1d4bb9c84eebc5f9d99b4d70d6d05e.zip
opensim-SC_OLD-37b07aa9ec1d4bb9c84eebc5f9d99b4d70d6d05e.tar.gz
opensim-SC_OLD-37b07aa9ec1d4bb9c84eebc5f9d99b4d70d6d05e.tar.bz2
opensim-SC_OLD-37b07aa9ec1d4bb9c84eebc5f9d99b4d70d6d05e.tar.xz
Fix a case where an idle sim can eat 100% of a core
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index eb284c1..f79eb5d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1314,7 +1314,7 @@ namespace OpenSim.Region.Framework.Scenes
1314 maintc = Util.EnvironmentTickCountSubtract(maintc); 1314 maintc = Util.EnvironmentTickCountSubtract(maintc);
1315 maintc = (int)(m_timespan * 1000) - maintc; 1315 maintc = (int)(m_timespan * 1000) - maintc;
1316 1316
1317 if ((maintc < (m_timespan * 1000)) && maintc > 0) 1317 if (maintc > 0)
1318 Thread.Sleep(maintc); 1318 Thread.Sleep(maintc);
1319 1319
1320 // Tell the watchdog that this thread is still alive 1320 // Tell the watchdog that this thread is still alive