diff options
| author | Robert Adams | 2017-09-05 06:24:04 -0700 |
|---|---|---|
| committer | Robert Adams | 2017-09-05 06:24:04 -0700 |
| commit | 921e3ceb09b04693d8241e27666d08c721efb82b (patch) | |
| tree | 747b0b4dedded833b1a033bcd51a70121987ee5c /OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs | |
| parent | Fixed typos in comments in osslEnable.ini (diff) | |
| parent | BulletSim: add raycast filtering (diff) | |
| download | opensim-SC_OLD-921e3ceb09b04693d8241e27666d08c721efb82b.zip opensim-SC_OLD-921e3ceb09b04693d8241e27666d08c721efb82b.tar.gz opensim-SC_OLD-921e3ceb09b04693d8241e27666d08c721efb82b.tar.bz2 opensim-SC_OLD-921e3ceb09b04693d8241e27666d08c721efb82b.tar.xz | |
BulletSim: Merge branch 'BulletSim2017'
Adds raycast using Bullet physics engine.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs')
| -rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs b/OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs index 953ddee..dc390b2 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs | |||
| @@ -450,6 +450,7 @@ public sealed class BSLinksetCompound : BSLinkset | |||
| 450 | m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, LinksetRoot.PhysBody); | 450 | m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, LinksetRoot.PhysBody); |
| 451 | DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addBody,body={1},shape={2}", | 451 | DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addBody,body={1},shape={2}", |
| 452 | LinksetRoot.LocalID, LinksetRoot.PhysBody, linksetShape); | 452 | LinksetRoot.LocalID, LinksetRoot.PhysBody, linksetShape); |
| 453 | m_physicsScene.PE.ResetBroadphasePool(m_physicsScene.World); // DEBUG DEBUG | ||
| 453 | 454 | ||
| 454 | // With all of the linkset packed into the root prim, it has the mass of everyone. | 455 | // With all of the linkset packed into the root prim, it has the mass of everyone. |
| 455 | LinksetMass = ComputeLinksetMass(); | 456 | LinksetMass = ComputeLinksetMass(); |