diff options
| author | Melanie | 2013-03-15 23:45:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-15 23:45:32 +0000 |
| commit | b9146a79220c7e15ff0241fb6216028ddf15bee8 (patch) | |
| tree | 18e3342a99e448b19a1a5bb29d9579ef9d9bb817 /OpenSim/Region/Physics/BulletSPlugin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change the table and field names of XAssetService mysql db tables to be capit... (diff) | |
| download | opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.zip opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.gz opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.bz2 opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin')
| -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, |