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/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | 1 -
 OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs     | 1 -
 2 files changed, 2 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')

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);
             }
         }
 
-- 
cgit v1.1


From 25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 6 Oct 2009 13:39:10 -0700
Subject: * Added a sanity check for Mono before trying to enumerate over an
 empty SortedDictionary * Changed the order of a log line from DotNetEngine so
 you can tell whether or not it is actually loading

---
 OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 3c91b29..9806218 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -129,10 +129,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
         public void AddRegion(Scene Sceneworld)
         {
-            m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing");
-
-            m_Scene = Sceneworld;
-
             // Make sure we have config
             if (ConfigSource.Configs[ScriptEngineName] == null)
                 ConfigSource.AddConfig(ScriptEngineName);
@@ -143,6 +139,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             if (!m_enabled)
                 return;
 
+            m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing");
+
+            m_Scene = Sceneworld;
+
             // Create all objects we'll be using
             m_EventQueueManager = new EventQueueManager(this);
             m_EventManager = new EventManager(this, true);
-- 
cgit v1.1