diff options
| author | Justin Clark-Casey (justincc) | 2012-11-22 03:01:26 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-22 03:01:26 +0000 |
| commit | 33a4f07c4e4e071abe64694ac0e95681807dc57f (patch) | |
| tree | 376c5038385b21164955bf1331646bd47db552df /bin/OpenSimDefaults.ini | |
| parent | Add regression test for a good request made to the asset service post handler. (diff) | |
| parent | BulletSim: update DLLs and SOs. No functional changes. Only the parameter blo... (diff) | |
| download | opensim-SC_OLD-33a4f07c4e4e071abe64694ac0e95681807dc57f.zip opensim-SC_OLD-33a4f07c4e4e071abe64694ac0e95681807dc57f.tar.gz opensim-SC_OLD-33a4f07c4e4e071abe64694ac0e95681807dc57f.tar.bz2 opensim-SC_OLD-33a4f07c4e4e071abe64694ac0e95681807dc57f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index c81c658..818321e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -913,7 +913,8 @@ | |||
| 913 | AvatarFriction = 0.2 | 913 | AvatarFriction = 0.2 |
| 914 | AvatarRestitution = 0.0 | 914 | AvatarRestitution = 0.0 |
| 915 | AvatarDensity = 60.0 | 915 | AvatarDensity = 60.0 |
| 916 | AvatarCapsuleRadius = 0.37 | 916 | AvatarCapsuleWidth = 0.6 |
| 917 | AvatarCapsuleDepth = 0.45 | ||
| 917 | AvatarCapsuleHeight = 1.5 | 918 | AvatarCapsuleHeight = 1.5 |
| 918 | AvatarContactProcessingThreshold = 0.1 | 919 | AvatarContactProcessingThreshold = 0.1 |
| 919 | 920 | ||