diff options
author | Justin Clark-Casey (justincc) | 2012-03-20 20:28:58 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-20 20:28:58 +0000 |
commit | 5f2a65c9762f626bc3389bcd85ae20e45aa09b04 (patch) | |
tree | 0ac9facccf6cd45dda70e75724f685e4eb01a7f3 /OpenSim/Region/Physics/OdePlugin | |
parent | Remove pointless ThreadAbortException catching in a test that isn't run anyway. (diff) | |
download | opensim-SC-5f2a65c9762f626bc3389bcd85ae20e45aa09b04.zip opensim-SC-5f2a65c9762f626bc3389bcd85ae20e45aa09b04.tar.gz opensim-SC-5f2a65c9762f626bc3389bcd85ae20e45aa09b04.tar.bz2 opensim-SC-5f2a65c9762f626bc3389bcd85ae20e45aa09b04.tar.xz |
refactor: Eliminate unnecessary duplicate avCapsuleTilted
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 598530c..1f8c2ca 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -181,8 +181,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
181 | private float avPIDP = 1400f; | 181 | private float avPIDP = 1400f; |
182 | private float avCapRadius = 0.37f; | 182 | private float avCapRadius = 0.37f; |
183 | private float avStandupTensor = 2000000f; | 183 | private float avStandupTensor = 2000000f; |
184 | private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode | 184 | |
185 | public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } } | 185 | /// <summary> |
186 | /// true = old compatibility mode with leaning capsule; false = new corrected mode | ||
187 | /// </summary> | ||
188 | public bool IsAvCapsuleTilted { get; private set; } | ||
189 | |||
186 | private float avDensity = 80f; | 190 | private float avDensity = 80f; |
187 | // private float avHeightFudgeFactor = 0.52f; | 191 | // private float avHeightFudgeFactor = 0.52f; |
188 | private float avMovementDivisorWalk = 1.3f; | 192 | private float avMovementDivisorWalk = 1.3f; |
@@ -501,7 +505,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
501 | avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); | 505 | avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); |
502 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); | 506 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); |
503 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); | 507 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); |
504 | avCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false); | 508 | IsAvCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false); |
505 | 509 | ||
506 | contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80); | 510 | contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80); |
507 | 511 | ||