2 files changed, 42 insertions, 28 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index a4b9d4c..3a01dc6 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
         }
 
-        public void touch_start(uint localID, LLVector3 offsetPos,
+        public void touch_start(uint localID, uint originalID, LLVector3 offsetPos,
                 IClientAPI remoteClient)
         {
             // Add to queue for all scripts in ObjectID object
@@ -89,19 +89,27 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             det[0].Key = remoteClient.AgentId;
             det[0].Populate(myScriptEngine.World);
 
-            SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
-                    localID);
-            if (part == null)
-                return;
-
-            det[0].LinkNum = part.LinkNum;
+            
+            if (originalID == 0)
+            {
+                SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(localID);
+                if (part == null)
+                    return;
 
+                det[0].LinkNum = part.LinkNum;
+            }
+            else
+            {
+                SceneObjectPart originalPart = myScriptEngine.World.GetSceneObjectPart(originalID);
+                det[0].LinkNum = originalPart.LinkNum;
+            }
+            
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "touch_start", new Object[] { new LSL_Types.LSLInteger(1) },
                     det));
         }
 
-        public void touch(uint localID, LLVector3 offsetPos,
+        public void touch(uint localID, uint originalID, LLVector3 offsetPos,
                 IClientAPI remoteClient)
         {
             // Add to queue for all scripts in ObjectID object
@@ -113,19 +121,26 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                                      offsetPos.Y,
                                                      offsetPos.Z);
 
-            SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
-                    localID);
-            if (part == null)
-                return;
+            if (originalID == 0)
+            {
+                SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(localID);
+                if (part == null)
+                    return;
 
-            det[0].LinkNum = part.LinkNum;
+                det[0].LinkNum = part.LinkNum;
+            }
+            else
+            {
+                SceneObjectPart originalPart = myScriptEngine.World.GetSceneObjectPart(originalID);
+                det[0].LinkNum = originalPart.LinkNum;
+            }
 
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "touch", new Object[] { new LSL_Types.LSLInteger(1) },
                     det));
         }
 
-        public void touch_end(uint localID, IClientAPI remoteClient)
+        public void touch_end(uint localID, uint originalID, IClientAPI remoteClient)
         {
             // Add to queue for all scripts in ObjectID object
             DetectParams[] det = new DetectParams[1];
@@ -133,12 +148,19 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             det[0].Key = remoteClient.AgentId;
             det[0].Populate(myScriptEngine.World);
 
-            SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
-                    localID);
-            if (part == null)
-                return;
+            if (originalID == 0)
+            {
+                SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(localID);
+                if (part == null)
+                    return;
 
-            det[0].LinkNum = part.LinkNum;
+                det[0].LinkNum = part.LinkNum;
+            }
+            else
+            {
+                SceneObjectPart originalPart = myScriptEngine.World.GetSceneObjectPart(originalID);
+                det[0].LinkNum = originalPart.LinkNum;
+            }
 
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "touch_end", new Object[] { new LSL_Types.LSLInteger(1) },
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c5bcfd5..8fd8a1c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -319,14 +319,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             get { return false; }
         }
 
-        //
-        // XEngine functions
-        //
-        public int MaxScriptQueue
-        {
-            get { return m_MaxScriptQueue; }
-        }
-
         public void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez)
         {
             Object[] parms = new Object[]
@@ -508,7 +500,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                            m_AppDomains[appDomain],
                            part.ParentGroup.RootPart.Name,
                            item.Name, startParam, postOnRez,
-                           StateSource.NewRez);
+                           StateSource.NewRez, m_MaxScriptQueue);
 
                     m_log.DebugFormat("[XEngine] Loaded script {0}.{1}",
                             part.ParentGroup.RootPart.Name, item.Name);