fill data for llDetected funtions of collisions closer to the event. (xengine wasn't update with this on merge bc was not used there). fix some parameters

2 files changed, 64 insertions, 31 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index d30a1c4..9f34c98 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -213,24 +213,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 if (presence.PresenceType == PresenceType.Npc)
                     Type = 0x20;
 
-                // Cope Impl. We don't use OS_NPC.
-                //if (presence.PresenceType != PresenceType.Npc)
-                //{
-                //    Type = AGENT;
-                //}
-                //else
-                //{
-                //    Type = OS_NPC;
-
-                //    INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
-                //    INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene);
-
-                //    if (npcData.SenseAsAgent)
-                //    {
-                //        Type |= AGENT;
-                //    }
-                //}
-
                 if (presence.Velocity != Vector3.Zero)
                     Type |= ACTIVE;
 
@@ -267,6 +249,64 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             Velocity = new LSL_Types.Vector3(part.Velocity);
         }
+
+        public void Populate(Scene scene, DetectedObject obj)
+        {
+            if(obj.keyUUID == UUID.Zero) // land
+            {
+                Position = new LSL_Types.Vector3(obj.posVector);
+                Rotation.s = 1.0;
+                return;
+            }
+
+            if((obj.colliderType & 0x21) != 0) // avatar or npc
+            {
+                ScenePresence presence = scene.GetScenePresence(obj.keyUUID);
+                if (presence == null)
+                    return;
+
+                Name = obj.nameStr;
+                Owner = obj.keyUUID;
+                Group = obj.groupUUID;
+                Position = new LSL_Types.Vector3(obj.posVector);
+                Rotation = new LSL_Types.Quaternion(obj.rotQuat);
+                Velocity = new LSL_Types.Vector3(obj.velVector);
+                LinkNum = obj.linkNumber;
+                Type = obj.colliderType;
+                return;
+            }
+
+            SceneObjectPart part = scene.GetSceneObjectPart(obj.keyUUID);
+            if(part == null)
+                return;
+
+            Name = obj.nameStr;
+            Owner = obj.keyUUID;
+            Group = obj.groupUUID;
+            Position = new LSL_Types.Vector3(obj.posVector);
+            Rotation = new LSL_Types.Quaternion(obj.rotQuat);
+            Velocity = new LSL_Types.Vector3(obj.velVector);
+            LinkNum = obj.linkNumber;
+            if(obj.velVector == Vector3.Zero)
+                Type = 4;
+            else
+                Type = 2;
+
+            part = part.ParentGroup.RootPart;
+            foreach (SceneObjectPart p in part.ParentGroup.Parts)
+            {
+                if (p.Inventory.ContainsScripts())
+                {
+                    // at sl a physical prim is active also if has active scripts
+                    // assuming all scripts are in run state to save time
+                    if((part.Flags & PrimFlags.Physics) != 0 )
+                        Type = 10; // script + active
+                    else
+                       Type |= SCRIPTED; // Scripted
+                    break;
+                }
+            }
+        }
     }
 
     /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index ad775ff..f1b1e66 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -244,7 +244,7 @@ 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);
             }
@@ -264,9 +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.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part
+                d.Populate(myScriptEngine.World, detobj);
                 det.Add(d);
             }
 
@@ -284,9 +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.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part
+                d.Populate(myScriptEngine.World, detobj);
                 det.Add(d);
             }
 
@@ -304,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",
@@ -322,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",
@@ -339,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",