aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-06 02:50:59 -0700
committerJohn Hurliman2009-10-06 02:50:59 -0700
commit2519f071f2c592aeea0414c8b2871e5df623271c (patch)
treede014d0e325a3cdcb8581849664ca2a8765021e1 /OpenSim/Region/Framework/Scenes/Scene.cs
parent* Continued work on the new LLUDP implementation. Appears to be functioning, ... (diff)
downloadopensim-SC-2519f071f2c592aeea0414c8b2871e5df623271c.zip
opensim-SC-2519f071f2c592aeea0414c8b2871e5df623271c.tar.gz
opensim-SC-2519f071f2c592aeea0414c8b2871e5df623271c.tar.bz2
opensim-SC-2519f071f2c592aeea0414c8b2871e5df623271c.tar.xz
Fixing a few compile errors in the previous commit
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 606135b..30c2223 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -901,7 +901,6 @@ namespace OpenSim.Region.Framework.Scenes
901 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); 901 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
902 if (HeartbeatThread != null) 902 if (HeartbeatThread != null)
903 { 903 {
904 ThreadTracker.Remove(HeartbeatThread);
905 HeartbeatThread.Abort(); 904 HeartbeatThread.Abort();
906 HeartbeatThread = null; 905 HeartbeatThread = null;
907 } 906 }
@@ -910,7 +909,6 @@ namespace OpenSim.Region.Framework.Scenes
910 HeartbeatThread.SetApartmentState(ApartmentState.MTA); 909 HeartbeatThread.SetApartmentState(ApartmentState.MTA);
911 HeartbeatThread.Name = string.Format("Heartbeat for region {0}", RegionInfo.RegionName); 910 HeartbeatThread.Name = string.Format("Heartbeat for region {0}", RegionInfo.RegionName);
912 HeartbeatThread.Priority = ThreadPriority.AboveNormal; 911 HeartbeatThread.Priority = ThreadPriority.AboveNormal;
913 ThreadTracker.Add(HeartbeatThread);
914 HeartbeatThread.Start(); 912 HeartbeatThread.Start();
915 } 913 }
916 914