diff options
| author | Justin Clark-Casey (justincc) | 2013-02-06 01:35:25 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-06 01:35:25 +0000 |
| commit | 0d4df99d0444973014e7cf0d5e00a8cd366ead8f (patch) | |
| tree | f57ceb5d8fda2e313647d2ba663d638b626493c4 /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | refactor: Move functions that lookup asset ids from task inventory or pass th... (diff) | |
| parent | BulletSim: make removing zero width triangles from meshes optional (diff) | |
| download | opensim-SC-0d4df99d0444973014e7cf0d5e00a8cd366ead8f.zip opensim-SC-0d4df99d0444973014e7cf0d5e00a8cd366ead8f.tar.gz opensim-SC-0d4df99d0444973014e7cf0d5e00a8cd366ead8f.tar.bz2 opensim-SC-0d4df99d0444973014e7cf0d5e00a8cd366ead8f.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 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 | ||