diff options
| author | Mic Bowman | 2013-02-08 22:43:56 -0800 |
|---|---|---|
| committer | Mic Bowman | 2013-02-08 22:43:56 -0800 |
| commit | 0a297a0e52b673427ff61b254f6065c217b1375d (patch) | |
| tree | aa337fff2dfda8677a7a76eb08b76a1d07df178a /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | Make JsonStore path parsing more robust. Should fix the (diff) | |
| parent | Fixed ReadSculptData(): the check whether there are enough bytes to read was ... (diff) | |
| download | opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.zip opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.tar.gz opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.tar.bz2 opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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); |