aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorDiva Canto2015-01-07 11:09:04 -0800
committerDiva Canto2015-01-07 11:09:04 -0800
commit14b3ee636d26605fb1f17f064f12989a21f33ebf (patch)
tree3f7321aa45d05685af88ffbdc79edb8f8462bf68 /bin/OpenSimDefaults.ini
parentAdded a different/better way of specifying data services in DataSnapshot -- u... (diff)
parentBulletSim: fix line ending problems. (diff)
downloadopensim-SC_OLD-14b3ee636d26605fb1f17f064f12989a21f33ebf.zip
opensim-SC_OLD-14b3ee636d26605fb1f17f064f12989a21f33ebf.tar.gz
opensim-SC_OLD-14b3ee636d26605fb1f17f064f12989a21f33ebf.tar.bz2
opensim-SC_OLD-14b3ee636d26605fb1f17f064f12989a21f33ebf.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini11
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 654b323..ad33423 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1070,6 +1070,17 @@
1070 AvatarHeightMidFudge = 0 ; Adjustment at mid point of avatar height range 1070 AvatarHeightMidFudge = 0 ; Adjustment at mid point of avatar height range
1071 AvatarHeightHighFudge = 0 ; Adjustment at high end of height range 1071 AvatarHeightHighFudge = 0 ; Adjustment at high end of height range
1072 1072
1073 ; Avatar walk-up-stairs parameters
1074 ; If an avatar collides with an object 'close to its feet', the avatar will be
1075 ; moved/pushed up do simulate stepping up.
1076 ;AvatarStepHeight = 0.6f ; The height, below which is considered a step collision.
1077 ;AvatarStepAngle = 0.3f ; The angle from vertical (in radians) to consider a surface a step
1078 ;AvatarStepApproachFactor = 2f ; Approach angle factor. O=straight on, .6=~45 degrees.
1079 ;AvatarStepGroundFudge = 0.1f ; Fudge added to bottom of avatar below which step collisions happen
1080 ;AvatarStepForceFactor = 0f ; Avatar is pushed up by its mass times this factor
1081 ;AvatarStepUpCorrectionFactor = 0.8f ; Avatar is displaced up the collision height times this factor
1082 ;AvatarStepSmoothingSteps = 1 ; Number of frames after a step collision that up correction is applied
1083
1073 ; Terminal velocity of a falling avatar 1084 ; Terminal velocity of a falling avatar
1074 ; This is the same http://en.wikipedia.org/wiki/Terminal_velocity#Examples 1085 ; This is the same http://en.wikipedia.org/wiki/Terminal_velocity#Examples
1075 ; negative for a downward speed. 1086 ; negative for a downward speed.