From 2519f071f2c592aeea0414c8b2871e5df623271c Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 6 Oct 2009 02:50:59 -0700
Subject: Fixing a few compile errors in the previous commit

---
 OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 1 -
 OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs             | 1 -
 OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs             | 2 --
 OpenSim/Region/Framework/Scenes/Scene.cs                                | 2 --
 OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs              | 1 -
 OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs  | 1 -
 OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs       | 1 -
 OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs           | 1 -
 .../ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs       | 1 -
 9 files changed, 11 deletions(-)

(limited to 'OpenSim/Region')

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
             httpThread.IsBackground = true;
             _finished = false;
             httpThread.Start();
-            ThreadTracker.Add(httpThread);
         }
 
         /*
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
             httpThread.IsBackground = true;
             _finished = false;
             httpThread.Start();
-            ThreadTracker.Add(httpThread);
         }
 
         /*
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
             mapItemReqThread.Priority = ThreadPriority.BelowNormal;
             mapItemReqThread.SetApartmentState(ApartmentState.MTA);
             mapItemReqThread.Start();
-            ThreadTracker.Add(mapItemReqThread);
         }
 
         /// <summary>
@@ -447,7 +446,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     // end gracefully
                     if (st.agentID == UUID.Zero)
                     {
-                        ThreadTracker.Remove(mapItemReqThread);
                         break;
                     }
 
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
             //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
             if (HeartbeatThread != null)
             {
-                ThreadTracker.Remove(HeartbeatThread);
                 HeartbeatThread.Abort();
                 HeartbeatThread = null;
             }
@@ -910,7 +909,6 @@ namespace OpenSim.Region.Framework.Scenes
             HeartbeatThread.SetApartmentState(ApartmentState.MTA);
             HeartbeatThread.Name = string.Format("Heartbeat for region {0}", RegionInfo.RegionName);
             HeartbeatThread.Priority = ThreadPriority.AboveNormal;
-            ThreadTracker.Add(HeartbeatThread);
             HeartbeatThread.Start();
         }
 
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
                     m_listener.Name = "IRCConnectorListenerThread";
                     m_listener.IsBackground = true;
                     m_listener.Start();
-                    ThreadTracker.Add(m_listener);
 
                     // This is the message order recommended by RFC 2812
                     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
                 m_thread.Name = "Content Management";
                 m_thread.IsBackground = true;
                 m_thread.Start();
-                ThreadTracker.Add(m_thread);
                 m_state = State.NONE;
             }
         }
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
             EventQueueThread.Priority = MyThreadPriority;
             EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount;
             EventQueueThread.Start();
-            ThreadTracker.Add(EventQueueThread);
 
             // Look at this... Don't you wish everyone did that solid
             // 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
                 MaintenanceThreadThread.Name = "ScriptMaintenanceThread";
                 MaintenanceThreadThread.IsBackground = true;
                 MaintenanceThreadThread.Start();
-                ThreadTracker.Add(MaintenanceThreadThread);
             }
         }
 
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
                 cmdHandlerThread.Priority = ThreadPriority.BelowNormal;
                 cmdHandlerThread.IsBackground = true;
                 cmdHandlerThread.Start();
-                ThreadTracker.Add(cmdHandlerThread);
             }
         }
 
-- 
cgit v1.1