Thank you, salahazar, for a patch that corrects the behavior of

llDetectedLink(). Also a small refactor to remove an interface member
from IScriptEngine.

2 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index a6bb405..3fdfd8a 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
             myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "state_entry", EventQueueManager.llDetectNull, new object[] { });
         }
 
-        public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
+        public void touch_start(uint localID, uint originalID, LLVector3 offsetPos, IClientAPI remoteClient)
         {
             // Add to queue for all scripts in ObjectID object
             EventQueueManager.Queue_llDetectParams_Struct detstruct = new EventQueueManager.Queue_llDetectParams_Struct();
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
             myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "touch_start", detstruct, new object[] { new LSL_Types.LSLInteger(1) });
         }
 
-        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
             EventQueueManager.Queue_llDetectParams_Struct detstruct = new EventQueueManager.Queue_llDetectParams_Struct();
@@ -220,12 +220,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
             myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "state_exit", EventQueueManager.llDetectNull, new object[] { });
         }
 
-        public void touch(uint localID, LLUUID itemID)
+        public void touch(uint localID, uint originalID, LLUUID itemID)
         {
             myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "touch", EventQueueManager.llDetectNull);
         }
 
-        public void touch_end(uint localID, LLUUID itemID)
+        public void touch_end(uint localID, uint originalID, LLUUID itemID)
         {
             myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "touch_end", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(1) });
         }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
index 9a465f6..41fde02 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
@@ -38,12 +38,12 @@ namespace OpenSim.Region.ScriptEngine.Common
     {
         public interface RemoteEvents
         {
-            void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient);
+            void touch_start(uint localID, uint originalID, LLVector3 offsetPos, IClientAPI remoteClient);
             void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez);
             void OnRemoveScript(uint localID, LLUUID itemID);
             void state_exit(uint localID);
-            void touch(uint localID, LLUUID itemID);
-            void touch_end(uint localID, LLUUID itemID);
+            void touch(uint localID, uint originalID, LLUUID itemID);
+            void touch_end(uint localID, uint originalID, LLUUID itemID);
             void collision_start(uint localID, ColliderArgs col);
             void collision(uint localID, ColliderArgs col);
             void collision_end(uint localID, ColliderArgs col);