diff options
| author | Justin Clark-Casey (justincc) | 2013-02-09 01:11:41 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-09 01:11:41 +0000 |
| commit | 6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b (patch) | |
| tree | 647e2ce5747ad8992111e9e89aefa825bffbbef2 /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that ... (diff) | |
| parent | BulletSim: add parameter to set global contact breaking threshold. Update DLL... (diff) | |
| download | opensim-SC-6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b.zip opensim-SC-6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b.tar.gz opensim-SC-6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b.tar.bz2 opensim-SC-6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index b51e9fd..41d353a 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
| @@ -597,7 +597,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 597 | if (IsActive) | 597 | if (IsActive) |
| 598 | { | 598 | { |
| 599 | // Remember the mass so we don't have to fetch it every step | 599 | // Remember the mass so we don't have to fetch it every step |
| 600 | m_vehicleMass = Prim.Linkset.LinksetMass; | 600 | m_vehicleMass = Prim.TotalMass; |
| 601 | 601 | ||
| 602 | // Friction affects are handled by this vehicle code | 602 | // Friction affects are handled by this vehicle code |
| 603 | PhysicsScene.PE.SetFriction(Prim.PhysBody, BSParam.VehicleFriction); | 603 | PhysicsScene.PE.SetFriction(Prim.PhysBody, BSParam.VehicleFriction); |