Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 17 insertions, 12 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 9405075..5c4174e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -96,12 +96,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             if (part == null)
                 return;
 
-            if ((part.ScriptEvents & scriptEvents.money) == 0)
-                part = part.ParentGroup.RootPart;
-
             m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount);
 
-//            part = part.ParentGroup.RootPart;
+            part = part.ParentGroup.RootPart;
             money(part.LocalId, agentID, amount);
         }
 
@@ -155,7 +152,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             det[0] = new DetectParams();
             det[0].Key = remoteClient.AgentId;
             det[0].Populate(myScriptEngine.World);
-            det[0].OffsetPos = offsetPos;
+            det[0].OffsetPos = new LSL_Types.Vector3(offsetPos.X,
+                                                     offsetPos.Y,
+                                                     offsetPos.Z);
 
             if (originalID == 0)
             {
@@ -299,7 +298,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             foreach (DetectedObject detobj in col.Colliders)
             {
                 DetectParams d = new DetectParams();
-                d.Position = detobj.posVector;
+                d.Position = new LSL_Types.Vector3(detobj.posVector.X,
+                    detobj.posVector.Y,
+                    detobj.posVector.Z);
                 d.Populate(myScriptEngine.World);
                 det.Add(d);
                 myScriptEngine.PostObjectEvent(localID, new EventParams(
@@ -317,7 +318,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             foreach (DetectedObject detobj in col.Colliders)
             {
                 DetectParams d = new DetectParams();
-                d.Position = detobj.posVector;
+                d.Position = new LSL_Types.Vector3(detobj.posVector.X,
+                    detobj.posVector.Y,
+                    detobj.posVector.Z);
                 d.Populate(myScriptEngine.World);
                 det.Add(d);
                 myScriptEngine.PostObjectEvent(localID, new EventParams(
@@ -334,7 +337,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             foreach (DetectedObject detobj in col.Colliders)
             {
                 DetectParams d = new DetectParams();
-                d.Position = detobj.posVector;
+                d.Position = new LSL_Types.Vector3(detobj.posVector.X,
+                    detobj.posVector.Y,
+                    detobj.posVector.Z);
                 d.Populate(myScriptEngine.World);
                 det.Add(d);
                 myScriptEngine.PostObjectEvent(localID, new EventParams(
@@ -376,8 +381,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "at_target", new object[] {
                     new LSL_Types.LSLInteger(handle),
-                    new LSL_Types.Vector3(targetpos),
-                    new LSL_Types.Vector3(atpos) },
+                    new LSL_Types.Vector3(targetpos.X,targetpos.Y,targetpos.Z),
+                    new LSL_Types.Vector3(atpos.X,atpos.Y,atpos.Z) },
                     new DetectParams[0]));
         }
 
@@ -394,8 +399,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "at_rot_target", new object[] {
                     new LSL_Types.LSLInteger(handle),
-                    new LSL_Types.Quaternion(targetrot),
-                    new LSL_Types.Quaternion(atrot) },
+                    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]));
         }