diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index de071314e6..6daa109598 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -2707,6 +2707,7 @@ namespace OpenSim.Region.Framework.Scenes detobj.velVector = obj.Velocity; detobj.colliderType = 0; detobj.groupUUID = obj.GroupID; + detobj.linkNumber = LinkNum; // pass my link number return detobj; } @@ -2722,6 +2723,7 @@ namespace OpenSim.Region.Framework.Scenes detobj.velVector = av.Velocity; detobj.colliderType = 0; detobj.groupUUID = av.ControllingClient.ActiveGroupId; + detobj.linkNumber = LinkNum; // pass my link number return detobj; } @@ -2737,6 +2739,7 @@ namespace OpenSim.Region.Framework.Scenes detobj.velVector = Vector3.Zero; detobj.colliderType = 0; detobj.groupUUID = UUID.Zero; + detobj.linkNumber = LinkNum; // pass my link number not sure needed.. but no harm return detobj; } diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9c55d4a68f..b19d20d351 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -5586,6 +5586,7 @@ namespace OpenSim.Region.Framework.Scenes detobj.velVector = obj.Velocity; detobj.colliderType = 0; detobj.groupUUID = obj.GroupID; + detobj.linkNumber = 0; return detobj; } @@ -5601,6 +5602,7 @@ namespace OpenSim.Region.Framework.Scenes detobj.velVector = av.Velocity; detobj.colliderType = 0; detobj.groupUUID = av.ControllingClient.ActiveGroupId; + detobj.linkNumber = 0; return detobj; } @@ -5616,7 +5618,7 @@ namespace OpenSim.Region.Framework.Scenes detobj.velVector = Vector3.Zero; detobj.colliderType = 0; detobj.groupUUID = UUID.Zero; - + detobj.linkNumber = 0; return detobj; } diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 0ff2da365b..ad775ff499 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs @@ -245,6 +245,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine 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 det.Add(d); } @@ -265,6 +266,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine 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 det.Add(d); } @@ -284,6 +286,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine 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 det.Add(d); }