diff options
| author | Diva Canto | 2014-07-03 20:09:38 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-07-03 20:09:38 -0700 |
| commit | d0782c2bc0f4d4f644188deec7638efaf8e81514 (patch) | |
| tree | 3788483ff89a3134b98726d9cb782814aca9efc0 /bin | |
| parent | Avoid an exception in creating child agents some times. (diff) | |
| parent | Temporarily disable new regression test TestLifecycle() until I have a chance... (diff) | |
| download | opensim-SC_OLD-d0782c2bc0f4d4f644188deec7638efaf8e81514.zip opensim-SC_OLD-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.gz opensim-SC_OLD-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.bz2 opensim-SC_OLD-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 8b8364c..3f373ce 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1038,6 +1038,11 @@ | |||
| 1038 | AvatarHeightMidFudge = 0 ; Adjustment at mid point of avatar height range | 1038 | AvatarHeightMidFudge = 0 ; Adjustment at mid point of avatar height range |
| 1039 | AvatarHeightHighFudge = 0 ; Adjustment at high end of height range | 1039 | AvatarHeightHighFudge = 0 ; Adjustment at high end of height range |
| 1040 | 1040 | ||
| 1041 | ; Terminal velocity of a falling avatar | ||
| 1042 | ; This is the same http://en.wikipedia.org/wiki/Terminal_velocity#Examples | ||
| 1043 | ; negative for a downward speed. | ||
| 1044 | AvatarTerminalVelocity = -54 | ||
| 1045 | |||
| 1041 | ; Default linkset implmentation | 1046 | ; Default linkset implmentation |
| 1042 | ; 'Constraint' uses physics constraints to hold linkset together. 'Compound' | 1047 | ; 'Constraint' uses physics constraints to hold linkset together. 'Compound' |
| 1043 | ; builds a compound shape from the children shapes to create a single physical | 1048 | ; builds a compound shape from the children shapes to create a single physical |