diff options
| author | Diva Canto | 2009-12-21 06:59:36 -0800 |
|---|---|---|
| committer | Diva Canto | 2009-12-21 06:59:36 -0800 |
| commit | 86104cd45c17f4112493ae1e095e44e18b3ac0be (patch) | |
| tree | 0653f44e969c9620dde01e6e8248559e06acfe65 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Making the library read the item's flag, so that clothing items can have the ... (diff) | |
| parent | Script State Fix: Part 2 (diff) | |
| download | opensim-SC_OLD-86104cd45c17f4112493ae1e095e44e18b3ac0be.zip opensim-SC_OLD-86104cd45c17f4112493ae1e095e44e18b3ac0be.tar.gz opensim-SC_OLD-86104cd45c17f4112493ae1e095e44e18b3ac0be.tar.bz2 opensim-SC_OLD-86104cd45c17f4112493ae1e095e44e18b3ac0be.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
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 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 |