diff options
| author | Justin Clark-Casey (justincc) | 2013-03-15 21:57:25 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-03-15 21:57:25 +0000 |
| commit | 8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b (patch) | |
| tree | 7040d86a73ec6829d79112f5865c166ab23b9b2f /OpenSim/Region/Physics | |
| parent | Make it possible to chain another asset service underneath the de-duplicating... (diff) | |
| parent | Add Vegaslon to CONTRIBUTORS.txt (diff) | |
| download | opensim-SC_OLD-8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b.zip opensim-SC_OLD-8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b.tar.gz opensim-SC_OLD-8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b.tar.bz2 opensim-SC_OLD-8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 235cefc..d347159 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
| @@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 1335 | Vector3 unscaledContribVerticalErrorV = vertContributionV; // DEBUG DEBUG | 1335 | Vector3 unscaledContribVerticalErrorV = vertContributionV; // DEBUG DEBUG |
| 1336 | vertContributionV /= m_verticalAttractionTimescale; | 1336 | vertContributionV /= m_verticalAttractionTimescale; |
| 1337 | 1337 | ||
| 1338 | VehicleRotationalVelocity += vertContributionV * VehicleOrientation; | 1338 | VehicleRotationalVelocity += vertContributionV; |
| 1339 | 1339 | ||
| 1340 | VDetailLog("{0}, MoveAngular,verticalAttraction,,origRotVW={1},vertError={2},unscaledV={3},eff={4},ts={5},vertContribV={6}", | 1340 | VDetailLog("{0}, MoveAngular,verticalAttraction,,origRotVW={1},vertError={2},unscaledV={3},eff={4},ts={5},vertContribV={6}", |
| 1341 | Prim.LocalID, origRotVelW, verticalError, unscaledContribVerticalErrorV, | 1341 | Prim.LocalID, origRotVelW, verticalError, unscaledContribVerticalErrorV, |