aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2011-10-26 17:48:51 +0100
committerMelanie2011-10-26 17:48:51 +0100
commit6a96c9546d4fd89f6e9319246cc2270836cf19f7 (patch)
treee6492419b9a03cb78435e911b345b4a31f749162 /OpenSim/Region/Framework
parentMerge branch 'master' into bigmerge (diff)
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
downloadopensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.zip
opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.gz
opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.bz2
opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework')
-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 8c7ce24..b2f5279 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1203,7 +1203,7 @@ namespace OpenSim.Region.Framework.Scenes
1203 { 1203 {
1204 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); 1204 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
1205 HeartbeatThread.Abort(); 1205 HeartbeatThread.Abort();
1206 Watchdog.RemoveThread(HeartbeatThread.ManagedThreadId); 1206 Watchdog.AbortThread(HeartbeatThread.ManagedThreadId);
1207 HeartbeatThread = null; 1207 HeartbeatThread = null;
1208 } 1208 }
1209 m_lastUpdate = Util.EnvironmentTickCount(); 1209 m_lastUpdate = Util.EnvironmentTickCount();