diff options
| author | Vegaslon | 2014-02-21 15:36:27 -0500 |
|---|---|---|
| committer | Michael Cerquoni | 2014-04-03 13:07:48 -0400 |
| commit | 3c5b7d7b7914932b98e355170aeacc8b3eaa0e05 (patch) | |
| tree | ae3606aff461f3e2d16de9c591016f3650965ed3 /OpenSim/Region/Physics | |
| parent | Move new Estate commands to OpenSim.cs (diff) | |
| download | opensim-SC_OLD-3c5b7d7b7914932b98e355170aeacc8b3eaa0e05.zip opensim-SC_OLD-3c5b7d7b7914932b98e355170aeacc8b3eaa0e05.tar.gz opensim-SC_OLD-3c5b7d7b7914932b98e355170aeacc8b3eaa0e05.tar.bz2 opensim-SC_OLD-3c5b7d7b7914932b98e355170aeacc8b3eaa0e05.tar.xz | |
BulletSim: Minor Fix to vehicle hovering, add more ways to disable it.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
Diffstat (limited to 'OpenSim/Region/Physics')
| -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 0722d70..769896b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
| @@ -1111,7 +1111,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 1111 | { | 1111 | { |
| 1112 | // m_VhoverEfficiency: 0=bouncy, 1=totally damped | 1112 | // m_VhoverEfficiency: 0=bouncy, 1=totally damped |
| 1113 | // m_VhoverTimescale: time to achieve height | 1113 | // m_VhoverTimescale: time to achieve height |
| 1114 | if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0) | 1114 | if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0 && (m_VhoverHeight > 0) && (m_VhoverTimescale < 300)) |
| 1115 | { | 1115 | { |
| 1116 | // We should hover, get the target height | 1116 | // We should hover, get the target height |
| 1117 | if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0) | 1117 | if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0) |