diff options
author | Melanie | 2012-05-13 01:25:03 +0100 |
---|---|---|
committer | Melanie | 2012-05-13 01:25:03 +0100 |
commit | fe029cf4e8fc0940d887329a823e66e0c29bd92e (patch) | |
tree | 7c2ae75849307cda30da96b6300ee30295610b42 /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | ubitODE fix force in case of mlinear motor offset present (diff) | |
download | opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.zip opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.gz opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.bz2 opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.xz |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 43b4581..b0711d7 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
@@ -1006,9 +1006,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1006 | } | 1006 | } |
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | if (velLengthSquared > 625.0f) // 25m/s apply breaks | 1009 | if (velLengthSquared > 2500.0f) // 50m/s apply breaks |
1010 | { | 1010 | { |
1011 | breakfactor = 0.31f * m_mass; | 1011 | breakfactor = 0.16f * m_mass; |
1012 | vec.X -= breakfactor * vel.X; | 1012 | vec.X -= breakfactor * vel.X; |
1013 | vec.Y -= breakfactor * vel.Y; | 1013 | vec.Y -= breakfactor * vel.Y; |
1014 | vec.Z -= breakfactor * vel.Z; | 1014 | vec.Z -= breakfactor * vel.Z; |