Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2011-08-30 22:07:32 +01:00 · 2011-08-30 22:07:32 +01:00 · 953611af53
parent e7a515bab0 b705ad477e
commit 953611af53
5 changed files with 4 additions and 4 deletions
--- a/bin/BulletSim-x86_64.dll
+++ b/bin/BulletSim-x86_64.dll
--- a/bin/BulletSim.dll
+++ b/bin/BulletSim.dll
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@ -736,15 +736,15 @@

 [BulletSim]
    ; World parameters
-    DefaultFriction = 0.70
+    DefaultFriction = 0.50
    DefaultDensity = 10.000006836
    DefaultRestitution = 0.0
    Gravity = -9.80665

-    TerrainFriction = 0.85
+    TerrainFriction = 0.50
    TerrainHitFriction = 0.8
-    TerrainRestitution = 0.2
-    AvatarFriction = 0.85
+    TerrainRestitution = 0
+    AvatarFriction = 0
    AvatarDensity = 60.0
    AvatarCapsuleRadius = 0.37
    AvatarCapsuleHeight = 1.5
--- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
--- a/bin/libBulletSim-x86_64.so
+++ b/bin/libBulletSim-x86_64.so