diff options
| author | Melanie | 2013-02-06 02:22:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-06 02:22:12 +0000 |
| commit | f567ff9f51aebe522c210b5d34b26754de157c91 (patch) | |
| tree | eac712a0ba78ca92b3178e2d532307c4ed489b06 /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.... (diff) | |
| download | opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.zip opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.gz opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.bz2 opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
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 8ecf2ff..b51e9fd 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
| @@ -1326,7 +1326,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 1326 | // If verticalError.Z is negative, the vehicle is upside down. Add additional push. | 1326 | // If verticalError.Z is negative, the vehicle is upside down. Add additional push. |
| 1327 | if (verticalError.Z < 0f) | 1327 | if (verticalError.Z < 0f) |
| 1328 | { | 1328 | { |
| 1329 | vertContributionV.X += PIOverFour; | 1329 | vertContributionV.X += Math.Sign(vertContributionV.X) * PIOverFour; |
| 1330 | // vertContribution.Y -= PIOverFour; | 1330 | // vertContribution.Y -= PIOverFour; |
| 1331 | } | 1331 | } |
| 1332 | 1332 | ||