Merge branch 'master' into careminster

2026-08-11 20:05:33 +08:00 · 2012-11-22 03:17:33 +00:00
parent 45eedb635a 448811ccdd
commit c4c6121752
21 changed files with 892 additions and 324 deletions
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -909,7 +909,8 @@
    AvatarFriction = 0.2
    AvatarRestitution = 0.0
    AvatarDensity = 60.0
-    AvatarCapsuleRadius = 0.37
+    AvatarCapsuleWidth = 0.6
+    AvatarCapsuleDepth = 0.45
    AvatarCapsuleHeight = 1.5
    AvatarContactProcessingThreshold = 0.1

--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so