diff options
| author | Robert Adams | 2012-11-03 18:26:00 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-11-03 21:15:54 -0700 |
| commit | 894bb4893b8bb269f8561737e4603a9b31183f2c (patch) | |
| tree | 03a9af547b801be262b4c4f956aa3152db1e90f2 /OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | |
| parent | BulletSim: Move construction of compound linkset from ShapeCollection (diff) | |
| download | opensim-SC-894bb4893b8bb269f8561737e4603a9b31183f2c.zip opensim-SC-894bb4893b8bb269f8561737e4603a9b31183f2c.tar.gz opensim-SC-894bb4893b8bb269f8561737e4603a9b31183f2c.tar.bz2 opensim-SC-894bb4893b8bb269f8561737e4603a9b31183f2c.tar.xz | |
BulletSim: search the mesh and hull lists to find shapes if type is not known. This makes sure the correct accounting is done for the particular shape.
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs index 67a59ef..d2387fb 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | |||
| @@ -294,7 +294,7 @@ public sealed class BSLinksetConstraints : BSLinkset | |||
| 294 | float linksetMass = LinksetMass; | 294 | float linksetMass = LinksetMass; |
| 295 | LinksetRoot.UpdatePhysicalMassProperties(linksetMass); | 295 | LinksetRoot.UpdatePhysicalMassProperties(linksetMass); |
| 296 | 296 | ||
| 297 | // DEBUG: see of inter-linkset collisions are causing problems | 297 | // DEBUG: see of inter-linkset collisions are causing problems |
| 298 | // BulletSimAPI.SetCollisionFilterMask2(LinksetRoot.BSBody.ptr, | 298 | // BulletSimAPI.SetCollisionFilterMask2(LinksetRoot.BSBody.ptr, |
| 299 | // (uint)CollisionFilterGroups.LinksetFilter, (uint)CollisionFilterGroups.LinksetMask); | 299 | // (uint)CollisionFilterGroups.LinksetFilter, (uint)CollisionFilterGroups.LinksetMask); |
| 300 | DetailLog("{0},BSLinksetConstraint.RecomputeLinksetConstraints,set,rBody={1},linksetMass={2}", | 300 | DetailLog("{0},BSLinksetConstraint.RecomputeLinksetConstraints,set,rBody={1},linksetMass={2}", |