Merge branch 'master' into careminster

1 files changed, 14 insertions, 8 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index b2eab45..ce22ba5 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -58,7 +58,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             myScriptEngine.World.EventManager.OnObjectDeGrab += touch_end;
             myScriptEngine.World.EventManager.OnScriptChangedEvent += changed;
             myScriptEngine.World.EventManager.OnScriptAtTargetEvent += at_target;
-            myScriptEngine.World.EventManager.OnScriptNotAtTargetEvent += not_at_target;
+            myScriptEngine.World.EventManager.OnScriptNotAtTargetEvent += not_at_target;

+            myScriptEngine.World.EventManager.OnScriptAtRotTargetEvent += at_rot_target;

+            myScriptEngine.World.EventManager.OnScriptNotAtRotTargetEvent += not_at_rot_target;

             myScriptEngine.World.EventManager.OnScriptControlEvent += control;
             myScriptEngine.World.EventManager.OnScriptColliderStart += collision_start;
             myScriptEngine.World.EventManager.OnScriptColliding += collision;
@@ -388,16 +390,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "not_at_target",new object[0],
                     new DetectParams[0]));
-        }
-
-        public void at_rot_target(uint localID, UUID itemID)
-        {
-            myScriptEngine.PostObjectEvent(localID, new EventParams(
-                    "at_rot_target",new object[0],
+        }

+

+        public void at_rot_target(uint localID, uint handle, Quaternion targetrot,

+                Quaternion atrot)

+        {

+            myScriptEngine.PostObjectEvent(localID, new EventParams(

+                    "at_rot_target", new object[] {
+                    new LSL_Types.LSLInteger(handle),
+                    new LSL_Types.Quaternion(targetrot.X,targetrot.Y,targetrot.Z,targetrot.W),
+                    new LSL_Types.Quaternion(atrot.X,atrot.Y,atrot.Z,atrot.W) },

                     new DetectParams[0]));
         }
 
-        public void not_at_rot_target(uint localID, UUID itemID)
+        public void not_at_rot_target(uint localID)
         {
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "not_at_rot_target",new object[0],