mirror of
https://github.com/opensim/opensim.git
synced 2026-07-13 19:14:51 +08:00
Merge branch 'master' into vehicles
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -97,7 +97,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
|
||||
MaintenanceThreadThread.Name = "ScriptMaintenanceThread";
|
||||
MaintenanceThreadThread.IsBackground = true;
|
||||
MaintenanceThreadThread.Start();
|
||||
ThreadTracker.Add(MaintenanceThreadThread);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -142,7 +142,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||
cmdHandlerThread.Priority = ThreadPriority.BelowNormal;
|
||||
cmdHandlerThread.IsBackground = true;
|
||||
cmdHandlerThread.Start();
|
||||
ThreadTracker.Add(cmdHandlerThread);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user