diff options
| author | CasperW | 2009-12-21 13:29:48 +0100 |
|---|---|---|
| committer | CasperW | 2009-12-21 13:29:48 +0100 |
| commit | d8d6e8a30415197eb55c59172abfb890ec7a46bd (patch) | |
| tree | db937d6c6e3816932781e7be90c318408d117a78 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Fixed a nasty crash in StandUp() that occurred when the part got killed with ... (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.zip opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.gz opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.bz2 opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.xz | |
Merge branch 'master' into casper
Diffstat (limited to '')
| -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 |