diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 6d0854b..8a3ff71 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2670,7 +2670,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2670 | detobj.velVector = obj.Velocity; | 2670 | detobj.velVector = obj.Velocity; |
2671 | detobj.colliderType = 0; | 2671 | detobj.colliderType = 0; |
2672 | detobj.groupUUID = obj.GroupID; | 2672 | detobj.groupUUID = obj.GroupID; |
2673 | detobj.linkNumber = LinkNum; | 2673 | if (VolumeDetectActive) |
2674 | detobj.linkNumber = 0; | ||
2675 | else | ||
2676 | detobj.linkNumber = LinkNum; | ||
2674 | return detobj; | 2677 | return detobj; |
2675 | } | 2678 | } |
2676 | 2679 | ||
@@ -2689,7 +2692,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2689 | else if(detobj.velVector != Vector3.Zero) | 2692 | else if(detobj.velVector != Vector3.Zero) |
2690 | detobj.colliderType |= 0x2; //active | 2693 | detobj.colliderType |= 0x2; //active |
2691 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; | 2694 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; |
2692 | detobj.linkNumber = LinkNum; | 2695 | if (VolumeDetectActive) |
2696 | detobj.linkNumber = 0; | ||
2697 | else | ||
2698 | detobj.linkNumber = LinkNum; | ||
2693 | 2699 | ||
2694 | return detobj; | 2700 | return detobj; |
2695 | } | 2701 | } |
@@ -2705,8 +2711,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2705 | detobj.velVector = Vector3.Zero; | 2711 | detobj.velVector = Vector3.Zero; |
2706 | detobj.colliderType = 0; | 2712 | detobj.colliderType = 0; |
2707 | detobj.groupUUID = UUID.Zero; | 2713 | detobj.groupUUID = UUID.Zero; |
2708 | detobj.linkNumber = LinkNum; // pass my link number not sure needed.. but no harm | 2714 | detobj.linkNumber = LinkNum; |
2709 | |||
2710 | return detobj; | 2715 | return detobj; |
2711 | } | 2716 | } |
2712 | 2717 | ||