diff options
author | UbitUmarov | 2014-09-23 23:59:05 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-23 23:59:05 +0100 |
commit | 6d2cdd31fe2bc330485cc519133e6d38562255ba (patch) | |
tree | ef49ab96b7074cb7a7ac6874fc71f0ed46297ee3 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Merge branch 'master' into ubitworkmaster (diff) | |
download | opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.zip opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.gz opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.bz2 opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.xz |
populate collision lists with LinkNumber, and detected structure in
Xengine
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index de07131..6daa109 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2707,6 +2707,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2707 | detobj.velVector = obj.Velocity; | 2707 | detobj.velVector = obj.Velocity; |
2708 | detobj.colliderType = 0; | 2708 | detobj.colliderType = 0; |
2709 | detobj.groupUUID = obj.GroupID; | 2709 | detobj.groupUUID = obj.GroupID; |
2710 | detobj.linkNumber = LinkNum; // pass my link number | ||
2710 | 2711 | ||
2711 | return detobj; | 2712 | return detobj; |
2712 | } | 2713 | } |
@@ -2722,6 +2723,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2722 | detobj.velVector = av.Velocity; | 2723 | detobj.velVector = av.Velocity; |
2723 | detobj.colliderType = 0; | 2724 | detobj.colliderType = 0; |
2724 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; | 2725 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; |
2726 | detobj.linkNumber = LinkNum; // pass my link number | ||
2725 | 2727 | ||
2726 | return detobj; | 2728 | return detobj; |
2727 | } | 2729 | } |
@@ -2737,6 +2739,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2737 | detobj.velVector = Vector3.Zero; | 2739 | detobj.velVector = Vector3.Zero; |
2738 | detobj.colliderType = 0; | 2740 | detobj.colliderType = 0; |
2739 | detobj.groupUUID = UUID.Zero; | 2741 | detobj.groupUUID = UUID.Zero; |
2742 | detobj.linkNumber = LinkNum; // pass my link number not sure needed.. but no harm | ||
2740 | 2743 | ||
2741 | return detobj; | 2744 | return detobj; |
2742 | } | 2745 | } |