aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5f18a44..ceff28b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -903,7 +903,6 @@ namespace OpenSim.Region.Framework.Scenes
903 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); 903 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
904 if (HeartbeatThread != null) 904 if (HeartbeatThread != null)
905 { 905 {
906 ThreadTracker.Remove(HeartbeatThread);
907 HeartbeatThread.Abort(); 906 HeartbeatThread.Abort();
908 HeartbeatThread = null; 907 HeartbeatThread = null;
909 } 908 }
@@ -912,7 +911,6 @@ namespace OpenSim.Region.Framework.Scenes
912 HeartbeatThread.SetApartmentState(ApartmentState.MTA); 911 HeartbeatThread.SetApartmentState(ApartmentState.MTA);
913 HeartbeatThread.Name = string.Format("Heartbeat for region {0}", RegionInfo.RegionName); 912 HeartbeatThread.Name = string.Format("Heartbeat for region {0}", RegionInfo.RegionName);
914 HeartbeatThread.Priority = ThreadPriority.AboveNormal; 913 HeartbeatThread.Priority = ThreadPriority.AboveNormal;
915 ThreadTracker.Add(HeartbeatThread);
916 HeartbeatThread.Start(); 914 HeartbeatThread.Start();
917 } 915 }
918 916
@@ -1448,6 +1446,9 @@ namespace OpenSim.Region.Framework.Scenes
1448 m_log.Info("[SCENE]: Loading objects from datastore"); 1446 m_log.Info("[SCENE]: Loading objects from datastore");
1449 1447
1450 List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); 1448 List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID);
1449
1450 m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count + " objects from the datastore");
1451
1451 foreach (SceneObjectGroup group in PrimsFromDB) 1452 foreach (SceneObjectGroup group in PrimsFromDB)
1452 { 1453 {
1453 if (group.RootPart == null) 1454 if (group.RootPart == null)