1 files changed, 56 insertions, 16 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index fdad5b0..8c967a2 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -32,11 +32,12 @@ using System.Threading;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins;
-using Timer=OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins.Timer;
-using Dataserver=OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins.Dataserver;
+using OpenSim.Region.ScriptEngine.Interfaces;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
+using Timer=OpenSim.Region.ScriptEngine.Shared.Api.Plugins.Timer;
 
-namespace OpenSim.Region.ScriptEngine.XEngine
+namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
     /// <summary>
     /// Handles LSL commands that takes long time and returns an event, for example timers, HTTP requests, etc.
@@ -46,18 +47,57 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         private static Thread cmdHandlerThread;
         private static int cmdHandlerThreadCycleSleepms;
 
-        public XEngine m_ScriptEngine;
+        private static List<AsyncCommandManager> m_Managers = new List<AsyncCommandManager>();
+        public IScriptEngine m_ScriptEngine;
 
-        public Dataserver m_Dataserver;
-        public Timer m_Timer;
-        public HttpRequest m_HttpRequest;
-        public Listener m_Listener;
-        public SensorRepeat m_SensorRepeat;
-        public XmlRequest m_XmlRequest;
+        private Dataserver m_Dataserver;
+        private Timer m_Timer;
+        private HttpRequest m_HttpRequest;
+        private Listener m_Listener;
+        private SensorRepeat m_SensorRepeat;
+        private XmlRequest m_XmlRequest;
 
-        public AsyncCommandManager(XEngine _ScriptEngine)
+        public Dataserver DataserverPlugin
+        {
+            get { return m_Dataserver; }
+        }
+
+        public Timer TimerPlugin
+        {
+            get { return m_Timer; }
+        }
+
+        public HttpRequest HttpRequestPlugin
+        {
+            get { return m_HttpRequest; }
+        }
+
+        public Listener ListenerPlugin
+        {
+            get { return m_Listener; }
+        }
+
+        public SensorRepeat SensorRepeatPlugin
+        {
+            get { return m_SensorRepeat; }
+        }
+
+        public XmlRequest XmlRequestPlugin
+        {
+            get { return m_XmlRequest; }
+        }
+
+        public AsyncCommandManager[] Managers
+        {
+            get { return m_Managers.ToArray(); }
+        }
+
+        public AsyncCommandManager(IScriptEngine _ScriptEngine)
         {
             m_ScriptEngine = _ScriptEngine;
+            if(!m_Managers.Contains(this))
+                m_Managers.Add(this);
+
             ReadConfig();
 
             // Create instances of all plugins
@@ -87,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void ReadConfig()
         {
-            cmdHandlerThreadCycleSleepms = m_ScriptEngine.ScriptConfigSource.GetInt("AsyncLLCommandLoopms", 100);
+            cmdHandlerThreadCycleSleepms = m_ScriptEngine.Config.GetInt("AsyncLLCommandLoopms", 100);
         }
 
         ~AsyncCommandManager()
@@ -119,9 +159,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     {
                         Thread.Sleep(cmdHandlerThreadCycleSleepms);
 
-                        foreach (XEngine xe in XEngine.ScriptEngines)
+                        foreach (AsyncCommandManager m in m_Managers)
                         {
-                            xe.m_ASYNCLSLCommandManager.DoOneCmdHandlerPass();
+                            m.DoOneCmdHandlerPass();
                         }
                     }
                 }
@@ -131,7 +171,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
         }
 
-        internal void DoOneCmdHandlerPass()
+        public void DoOneCmdHandlerPass()
         {
             // Check timers
             m_Timer.CheckTimerEvents();