diff options
author | John Hurliman | 2009-10-06 02:50:59 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-06 02:50:59 -0700 |
commit | 2519f071f2c592aeea0414c8b2871e5df623271c (patch) | |
tree | de014d0e325a3cdcb8581849664ca2a8765021e1 /OpenSim/Region | |
parent | * Continued work on the new LLUDP implementation. Appears to be functioning, ... (diff) | |
download | opensim-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')
9 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 45e724d..d78931a 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -323,7 +323,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
323 | httpThread.IsBackground = true; | 323 | httpThread.IsBackground = true; |
324 | _finished = false; | 324 | _finished = false; |
325 | httpThread.Start(); | 325 | httpThread.Start(); |
326 | ThreadTracker.Add(httpThread); | ||
327 | } | 326 | } |
328 | 327 | ||
329 | /* | 328 | /* |
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index 8a169f8..97899a7 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
@@ -639,7 +639,6 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
639 | httpThread.IsBackground = true; | 639 | httpThread.IsBackground = true; |
640 | _finished = false; | 640 | _finished = false; |
641 | httpThread.Start(); | 641 | httpThread.Start(); |
642 | ThreadTracker.Add(httpThread); | ||
643 | } | 642 | } |
644 | 643 | ||
645 | /* | 644 | /* |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 05ed70a..4fb4c51 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -345,7 +345,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
345 | mapItemReqThread.Priority = ThreadPriority.BelowNormal; | 345 | mapItemReqThread.Priority = ThreadPriority.BelowNormal; |
346 | mapItemReqThread.SetApartmentState(ApartmentState.MTA); | 346 | mapItemReqThread.SetApartmentState(ApartmentState.MTA); |
347 | mapItemReqThread.Start(); | 347 | mapItemReqThread.Start(); |
348 | ThreadTracker.Add(mapItemReqThread); | ||
349 | } | 348 | } |
350 | 349 | ||
351 | /// <summary> | 350 | /// <summary> |
@@ -447,7 +446,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
447 | // end gracefully | 446 | // end gracefully |
448 | if (st.agentID == UUID.Zero) | 447 | if (st.agentID == UUID.Zero) |
449 | { | 448 | { |
450 | ThreadTracker.Remove(mapItemReqThread); | ||
451 | break; | 449 | break; |
452 | } | 450 | } |
453 | 451 | ||
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 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs index 9273fb5..cd401a6 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | |||
@@ -360,7 +360,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
360 | m_listener.Name = "IRCConnectorListenerThread"; | 360 | m_listener.Name = "IRCConnectorListenerThread"; |
361 | m_listener.IsBackground = true; | 361 | m_listener.IsBackground = true; |
362 | m_listener.Start(); | 362 | m_listener.Start(); |
363 | ThreadTracker.Add(m_listener); | ||
364 | 363 | ||
365 | // This is the message order recommended by RFC 2812 | 364 | // This is the message order recommended by RFC 2812 |
366 | if (m_password != null) | 365 | if (m_password != null) |
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs index 7202601..16fe9e9 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs | |||
@@ -152,7 +152,6 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
152 | m_thread.Name = "Content Management"; | 152 | m_thread.Name = "Content Management"; |
153 | m_thread.IsBackground = true; | 153 | m_thread.IsBackground = true; |
154 | m_thread.Start(); | 154 | m_thread.Start(); |
155 | ThreadTracker.Add(m_thread); | ||
156 | m_state = State.NONE; | 155 | m_state = State.NONE; |
157 | } | 156 | } |
158 | } | 157 | } |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index 0feb967..583d2ff 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | |||
@@ -138,7 +138,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
138 | EventQueueThread.Priority = MyThreadPriority; | 138 | EventQueueThread.Priority = MyThreadPriority; |
139 | EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount; | 139 | EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount; |
140 | EventQueueThread.Start(); | 140 | EventQueueThread.Start(); |
141 | ThreadTracker.Add(EventQueueThread); | ||
142 | 141 | ||
143 | // Look at this... Don't you wish everyone did that solid | 142 | // Look at this... Don't you wish everyone did that solid |
144 | // coding everywhere? :P | 143 | // coding everywhere? :P |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs index 8bafe77..7ffdb1a 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs | |||
@@ -97,7 +97,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
97 | MaintenanceThreadThread.Name = "ScriptMaintenanceThread"; | 97 | MaintenanceThreadThread.Name = "ScriptMaintenanceThread"; |
98 | MaintenanceThreadThread.IsBackground = true; | 98 | MaintenanceThreadThread.IsBackground = true; |
99 | MaintenanceThreadThread.Start(); | 99 | MaintenanceThreadThread.Start(); |
100 | ThreadTracker.Add(MaintenanceThreadThread); | ||
101 | } | 100 | } |
102 | } | 101 | } |
103 | 102 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index e454524..1607d34 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
@@ -142,7 +142,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
142 | cmdHandlerThread.Priority = ThreadPriority.BelowNormal; | 142 | cmdHandlerThread.Priority = ThreadPriority.BelowNormal; |
143 | cmdHandlerThread.IsBackground = true; | 143 | cmdHandlerThread.IsBackground = true; |
144 | cmdHandlerThread.Start(); | 144 | cmdHandlerThread.Start(); |
145 | ThreadTracker.Add(cmdHandlerThread); | ||
146 | } | 145 | } |
147 | } | 146 | } |
148 | 147 | ||