6 files changed, 47 insertions, 44 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
index 47ab420..6c88ae86 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Dataserver.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
@@ -29,9 +29,10 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
-using OpenSim.Region.ScriptEngine.XEngine.Script;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
 
-namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
+namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 {
     public class Dataserver
     {
@@ -94,10 +95,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
             }
 
             m_CmdManager.m_ScriptEngine.PostObjectEvent(ds.localID,
-                    new XEventParams("dataserver", new Object[]
+                    new EventParams("dataserver", new Object[]
                             { new LSL_Types.LSLString(ds.ID.ToString()),
                             new LSL_Types.LSLString(reply)},
-                    new XDetectParams[0]));
+                    new DetectParams[0]));
         }
 
         public void RemoveEvents(uint localID, LLUUID itemID)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
index 089e016..92f603d 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/HttpRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
@@ -28,9 +28,11 @@
 using System;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
-using OpenSim.Region.ScriptEngine.XEngine.Script;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Interfaces;
+using OpenSim.Region.ScriptEngine.Shared.Api;
 
-namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
+namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 {
     public class HttpRequest
     {
@@ -75,11 +77,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                     new LSL_Types.LSLString(httpInfo.response_body)
                 };
 
-                foreach (XEngine xe in XEngine.ScriptEngines)
+                foreach (AsyncCommandManager m in m_CmdManager.Managers)
                 {
-                    if (xe.PostObjectEvent(httpInfo.localID,
-                            new XEventParams("http_response",
-                            resobj, new XDetectParams[0])))
+                    if (m.m_ScriptEngine.PostObjectEvent(httpInfo.localID,
+                            new EventParams("http_response",
+                            resobj, new DetectParams[0])))
                         break;
                 }
                 httpInfo = iHttpReq.GetNextCompletedRequest();
diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
index 1144c00..11b45b1 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Listener.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
@@ -29,9 +29,10 @@ using System;
 using libsecondlife;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
-using OpenSim.Region.ScriptEngine.XEngine.Script;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
 
-namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
+namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 {
     public class Listener
     {
@@ -66,9 +67,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                     };
 
                     m_CmdManager.m_ScriptEngine.PostScriptEvent(
-                            lInfo.GetItemID(), new XEventParams(
+                            lInfo.GetItemID(), new EventParams(
                             "listen", resobj,
-                            new XDetectParams[0]));
+                            new DetectParams[0]));
                 }
             }
         }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 8a25098..5833512 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -30,9 +30,10 @@ using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ScriptEngine.XEngine.Script;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
 
-namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
+namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 {
     public class SensorRepeat
     {
@@ -72,8 +73,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                                         string name, LLUUID keyID, int type, double range,
                                         double arc, double sec, SceneObjectPart host)
         {
-            Console.WriteLine("SetSensorEvent");
-
             // Always remove first, in case this is a re-set
             UnSetSenseRepeaterEvents(m_localID, m_itemID);
             if (sec == 0) // Disabling timer
@@ -163,7 +162,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                 Dictionary<LLUUID, LSL_Types.list> Obj = null;
                 if (!SenseEvents.TryGetValue(m_localID, out Obj))
                 {
-                    m_CmdManager.m_ScriptEngine.Log.Info("[AsyncLSL]: GetSensorList missing localID: " + m_localID);
                     return null;
                 }
                 lock (Obj)
@@ -172,7 +170,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                     LSL_Types.list SenseList = null;
                     if (!Obj.TryGetValue(m_itemID, out SenseList))
                     {
-                        m_CmdManager.m_ScriptEngine.Log.Info("[AsyncLSL]: GetSensorList missing itemID: " + m_itemID);
                         return null;
                     }
                     return SenseList;
@@ -182,15 +179,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
 
         private void SensorSweep(SenseRepeatClass ts)
         {
-            //m_ScriptEngine.Log.Info("[AsyncLSL]:Enter SensorSweep");
             SceneObjectPart SensePoint = ts.host;
 
             if (SensePoint == null)
             {
-                //m_ScriptEngine.Log.Info("[AsyncLSL]: Enter SensorSweep (SensePoint == null) for "+ts.itemID.ToString());
                 return;
             }
-            //m_ScriptEngine.Log.Info("[AsyncLSL]: Enter SensorSweep Scan");
 
             LLVector3 sensorPos = SensePoint.AbsolutePosition;
             LLVector3 regionPos = new LLVector3(m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocX * Constants.RegionSize, m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocY * Constants.RegionSize, 0);
@@ -220,7 +214,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                         objtype |= 0x04; // passive non-moving
                     else
                         objtype |= 0x02; // active moving
-                    if (ent is IScript) objtype |= 0x08; // Scripted. It COULD have one hidden ...
+
+                    SceneObjectPart part = m_CmdManager.m_ScriptEngine.World.GetSceneObjectPart(ent.UUID);
+
+                    if (part != null && part.ContainsScripts()) objtype |= 0x08; // Scripted. It COULD have one hidden ...
 
                     if (((ts.type & objtype) != 0) || ((ts.type & objtype) == ts.type))
                     {
@@ -288,7 +285,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                     }
                 }
             }
-            //m_ScriptEngine.Log.Info("[AsyncLSL]: Enter SensorSweep SenseLock");
 
             lock (SenseLock)
             {
@@ -311,24 +307,24 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                     // send a "no_sensor"
                     // Add it to queue
                     m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
-                            new XEventParams("no_sensor", new Object[0],
-                            new XDetectParams[0]));
+                            new EventParams("no_sensor", new Object[0],
+                            new DetectParams[0]));
                 }
                 else
                 {
-                    XDetectParams[] detect =
-                            new XDetectParams[SensedObjects.Length];
+                    DetectParams[] detect =
+                            new DetectParams[SensedObjects.Length];
 
                     int idx;
                     for (idx = 0; idx < SensedObjects.Length; idx++)
                     {
-                        detect[idx] = new XDetectParams();
+                        detect[idx] = new DetectParams();
                         detect[idx].Key=(LLUUID)(SensedObjects.Data[idx]);
                         detect[idx].Populate(m_CmdManager.m_ScriptEngine.World);
                     }
 
                     m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
-                            new XEventParams("sensor",
+                            new EventParams("sensor",
                             new Object[] {
                             new LSL_Types.LSLInteger(SensedObjects.Length) },
                             detect));
diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 3dd875a..36e992b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -29,8 +29,9 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
+using OpenSim.Region.ScriptEngine.Shared.Api;
 
-namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
+namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 {
     public class Timer
     {
@@ -110,8 +111,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                         //                        Console.WriteLine("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
                         // Add it to queue
                         m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
-                                new XEventParams("timer", new Object[0],
-                                new XDetectParams[0]));
+                                new EventParams("timer", new Object[0],
+                                new DetectParams[0]));
                         // set next interval
 
                         //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
index 288349e..89bf51c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/XmlRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
@@ -28,9 +28,11 @@
 using System;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
-using OpenSim.Region.ScriptEngine.XEngine.Script;
+using OpenSim.Region.ScriptEngine.Interfaces;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
 
-namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
+namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 {
     public class XmlRequest
     {
@@ -69,12 +71,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                         new LSL_Types.LSLString(rInfo.GetStrVal())
                     };
                     
-                    foreach (XEngine xe in XEngine.ScriptEngines)
+                    foreach (AsyncCommandManager m in m_CmdManager.Managers)
                     {
-                        if (xe.PostScriptEvent(
-                                rInfo.GetItemID(), new XEventParams(
+                        if (m.m_ScriptEngine.PostScriptEvent(
+                                rInfo.GetItemID(), new EventParams(
                                     "remote_data", resobj,
-                                    new XDetectParams[0])))
+                                    new DetectParams[0])))
                             break;
                     }
 
@@ -98,12 +100,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
                         new LSL_Types.LSLString(srdInfo.sdata)
                     };
 
-                    foreach (XEngine xe in XEngine.ScriptEngines)
+                    foreach (AsyncCommandManager m in m_CmdManager.Managers)
                     {
-                        if (xe.PostScriptEvent(
-                                srdInfo.m_itemID, new XEventParams(
+                        if (m.m_ScriptEngine.PostScriptEvent(
+                                srdInfo.m_itemID, new EventParams(
                                     "remote_data", resobj,
-                                    new XDetectParams[0])))
+                                    new DetectParams[0])))
                             break;
                     }