From: Chris Yeoh <yeohc@au1.ibm.com>

This patch ensures that the touch positions are set during touch_end
events (currently only working for touch_start and touch events).

2 files changed, 14 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index b97f62e..dc49549 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -208,7 +208,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                     det));
         }
 
-        public void touch_end(uint localID, uint originalID, IClientAPI remoteClient)
+        public void touch_end(uint localID, uint originalID, IClientAPI remoteClient,
+                              SurfaceTouchEventArgs surfaceArgs)
         {
             // Add to queue for all scripts in ObjectID object
             DetectParams[] det = new DetectParams[1];
@@ -232,6 +233,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                 det[0].LinkNum = originalPart.LinkNum;
             }
 
+            if (surfaceArgs != null)
+            {
+                det[0].SurfaceTouchArgs = surfaceArgs;
+            }
+
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "touch_end", new Object[] { new LSL_Types.LSLInteger(1) },
                     det));
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index e4db0b5..3b9ff2e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -156,7 +156,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     det));
         }
 
-        public void touch_end(uint localID, uint originalID, IClientAPI remoteClient)
+        public void touch_end(uint localID, uint originalID, IClientAPI remoteClient,
+                              SurfaceTouchEventArgs surfaceArgs)
         {
             // Add to queue for all scripts in ObjectID object
             DetectParams[] det = new DetectParams[1];
@@ -178,6 +179,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 det[0].LinkNum = originalPart.LinkNum;
             }
 
+            if (surfaceArgs != null)
+            {
+                det[0].SurfaceTouchArgs = surfaceArgs;
+            }
+
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "touch_end", new Object[] { new LSL_Types.LSLInteger(1) },
                     det));