Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 16 insertions, 13 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 0ff2da3..55a77bc 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         }
 
         /// <summary>
-        /// When an object gets paid by an avatar and generates the paid event, 
+        /// When an object gets paid by an avatar and generates the paid event,
         /// this will pipe it to the script engine
         /// </summary>
         /// <param name="objectID">Object ID that got paid</param>
@@ -244,7 +244,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             {
                 DetectParams d = new DetectParams();
                 d.Key =detobj.keyUUID;
-                d.Populate(myScriptEngine.World);
+                d.Populate(myScriptEngine.World, detobj);
+                d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part
                 det.Add(d);
             }
 
@@ -263,8 +264,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             foreach (DetectedObject detobj in col.Colliders)
             {
                 DetectParams d = new DetectParams();
-                d.Key =detobj.keyUUID;
-                d.Populate(myScriptEngine.World);
+                d.Populate(myScriptEngine.World, detobj);
                 det.Add(d);
             }
 
@@ -282,8 +282,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             foreach (DetectedObject detobj in col.Colliders)
             {
                 DetectParams d = new DetectParams();
-                d.Key =detobj.keyUUID;
-                d.Populate(myScriptEngine.World);
+                d.Populate(myScriptEngine.World, detobj);
                 det.Add(d);
             }
 
@@ -301,8 +300,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             foreach (DetectedObject detobj in col.Colliders)
             {
                 DetectParams d = new DetectParams();
-                d.Position = detobj.posVector;
-                d.Populate(myScriptEngine.World);
+                d.Populate(myScriptEngine.World, detobj);
                 det.Add(d);
                 myScriptEngine.PostObjectEvent(localID, new EventParams(
                         "land_collision_start",
@@ -319,8 +317,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             foreach (DetectedObject detobj in col.Colliders)
             {
                 DetectParams d = new DetectParams();
-                d.Position = detobj.posVector;
-                d.Populate(myScriptEngine.World);
+                d.Populate(myScriptEngine.World,detobj);
                 det.Add(d);
                 myScriptEngine.PostObjectEvent(localID, new EventParams(
                         "land_collision",
@@ -336,8 +333,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             foreach (DetectedObject detobj in col.Colliders)
             {
                 DetectParams d = new DetectParams();
-                d.Position = detobj.posVector;
-                d.Populate(myScriptEngine.World);
+                d.Populate(myScriptEngine.World,detobj);
                 det.Add(d);
                 myScriptEngine.PostObjectEvent(localID, new EventParams(
                         "land_collision_end",
@@ -412,10 +408,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void attach(uint localID, UUID itemID, UUID avatar)
         {
-            myScriptEngine.PostObjectEvent(localID, new EventParams(
+            SceneObjectGroup grp = myScriptEngine.World.GetSceneObjectGroup(localID);
+            if(grp == null)
+                return;
+
+            foreach(SceneObjectPart part in grp.Parts)
+            {
+                myScriptEngine.PostObjectEvent(part.LocalId, new EventParams(
                     "attach",new object[] {
                     new LSL_Types.LSLString(avatar.ToString()) },
                     new DetectParams[0]));
+            }
         }
 
         // dataserver: not handled here