ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 6702: fix collisions lldetectedlinknumber also on Yengine

Browse Source
This commit is contained in:
UbitUmarov
2019-01-30 12:27:03 +00:00
parent dd43e613f0
commit 73e64c6597
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -2670,7 +2670,10 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = obj.Velocity;
detobj.colliderType = 0;
detobj.groupUUID = obj.GroupID;
detobj.linkNumber = LinkNum;
if (VolumeDetectActive)
detobj.linkNumber = 0;
else
detobj.linkNumber = LinkNum;
return detobj;
}
@@ -2689,7 +2692,10 @@ namespace OpenSim.Region.Framework.Scenes
else if(detobj.velVector != Vector3.Zero)
detobj.colliderType |= 0x2; //active
detobj.groupUUID = av.ControllingClient.ActiveGroupId;
detobj.linkNumber = LinkNum;
if (VolumeDetectActive)
detobj.linkNumber = 0;
else
detobj.linkNumber = LinkNum;
return detobj;
}
@@ -2705,8 +2711,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
detobj.linkNumber = LinkNum;
return detobj;
}