aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-11-09 19:26:42 +0000
committerJustin Clark-Casey (justincc)2009-11-09 19:26:42 +0000
commita88a463b5021ff6d40a37298f39e58e93dec6cfa (patch)
tree87d99409c2d12c344b76b5e4012cd5713596d333
parentminor: remove some mono compiler warnings (diff)
downloadopensim-SC-a88a463b5021ff6d40a37298f39e58e93dec6cfa.zip
opensim-SC-a88a463b5021ff6d40a37298f39e58e93dec6cfa.tar.gz
opensim-SC-a88a463b5021ff6d40a37298f39e58e93dec6cfa.tar.bz2
opensim-SC-a88a463b5021ff6d40a37298f39e58e93dec6cfa.tar.xz
Following various discussions on irc and in the OpenSim dev OSGrid meeting last week, change av_capsule_tilted to false by default
This appears to now give better ODE physics response (less sinking into the ground, etc.) Please change it back if this is actually a bad idea for some reason
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs2
-rw-r--r--bin/OpenSim.ini.example2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 3c9a31d..981cf43 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -439,7 +439,7 @@ namespace OpenSim.Region.Physics.OdePlugin
439 avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); 439 avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f);
440 avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); 440 avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f);
441 avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); 441 avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f);
442 avCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", true); 442 avCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false);
443 443
444 contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80); 444 contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80);
445 445
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6606270..116a8fd 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -543,7 +543,7 @@
543 543
544 ; specifies if the capsule should be tilted (=true; old compatibility mode) 544 ; specifies if the capsule should be tilted (=true; old compatibility mode)
545 ; or straight up-and-down (=false; better and more consistent physics behavior) 545 ; or straight up-and-down (=false; better and more consistent physics behavior)
546 av_capsule_tilted = true 546 av_capsule_tilted = false
547 547
548 ; used to calculate mass of avatar. 548 ; used to calculate mass of avatar.
549 ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH); 549 ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);