diff options
| author | Melanie | 2012-12-30 03:43:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-30 03:43:51 +0000 |
| commit | 7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5 (patch) | |
| tree | e2b5b94a95511a6e26c56b611e7b7445c28d119f /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: remove check for small motor movement because, while it (diff) | |
| download | opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.zip opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.gz opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.bz2 opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 9bfab4a..12474a7 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -915,9 +915,9 @@ | |||
| 915 | TerrainCollisionMargin = 0.04 | 915 | TerrainCollisionMargin = 0.04 |
| 916 | 916 | ||
| 917 | AvatarFriction = 0.2 | 917 | AvatarFriction = 0.2 |
| 918 | AvatarStandingFriction = 0.99 | 918 | AvatarStandingFriction = 10.0 |
| 919 | AvatarRestitution = 0.0 | 919 | AvatarRestitution = 0.0 |
| 920 | AvatarDensity = 60.0 | 920 | AvatarDensity = 3.5 |
| 921 | AvatarCapsuleWidth = 0.6 | 921 | AvatarCapsuleWidth = 0.6 |
| 922 | AvatarCapsuleDepth = 0.45 | 922 | AvatarCapsuleDepth = 0.45 |
| 923 | AvatarCapsuleHeight = 1.5 | 923 | AvatarCapsuleHeight = 1.5 |