aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-03-13 18:10:43 +0000
committerUbitUmarov2012-03-13 18:10:43 +0000
commit923db53975cd91dca86aee8c7a6c07c25b26db87 (patch)
tree545c458d07816853a0a1eb79ea3da02508b5fb76 /OpenSim
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
downloadopensim-SC-923db53975cd91dca86aee8c7a6c07c25b26db87.zip
opensim-SC-923db53975cd91dca86aee8c7a6c07c25b26db87.tar.gz
opensim-SC-923db53975cd91dca86aee8c7a6c07c25b26db87.tar.bz2
opensim-SC-923db53975cd91dca86aee8c7a6c07c25b26db87.tar.xz
let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy with it disabled...
Diffstat (limited to '')
-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 24e6eb1..a3358a5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4882,7 +4882,7 @@ Environment.Exit(1);
4882 4882
4883 private void CheckHeartbeat() 4883 private void CheckHeartbeat()
4884 { 4884 {
4885// if (m_firstHeartbeat) 4885 if (m_firstHeartbeat)
4886 return; 4886 return;
4887 4887
4888 if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 5000) 4888 if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 5000)