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

author: Justin Clark-Casey (justincc) 2011-08-30 22:07:32 +0100
committer: Justin Clark-Casey (justincc) 2011-08-30 22:07:32 +0100
commit: 953611af53d12bad8b2f25427505e0bdadeda366 (patch)
tree: 494e1723c26193fbf0020be1a6ff6c82b7b29f71
parent: Fix bug where attachments were remaining on the avatar after being dropped. (diff)
parent: BulletSim: update values in OpenSimDefaults.ini to the same as defaults in th... (diff)
download: opensim-SC_OLD-953611af53d12bad8b2f25427505e0bdadeda366.zip
opensim-SC_OLD-953611af53d12bad8b2f25427505e0bdadeda366.tar.gz
opensim-SC_OLD-953611af53d12bad8b2f25427505e0bdadeda366.tar.bz2
opensim-SC_OLD-953611af53d12bad8b2f25427505e0bdadeda366.tar.xz
5 files changed, 4 insertions, 4 deletions
diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll
index a25b93b..6620759 100755
--- a/bin/BulletSim-x86_64.dll
+++ b/bin/BulletSim-x86_64.dll
Binary files differ
diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll
index efd420a..ffb5380 100755
--- a/bin/BulletSim.dll
+++ b/bin/BulletSim.dll
Binary files differ
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index f1c0aab..ca4fbfb 100644
--- 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
+    TerrainRestitution = 0
-    AvatarFriction = 0.85
+    AvatarFriction = 0
    AvatarDensity = 60.0
    AvatarCapsuleRadius = 0.37
    AvatarCapsuleHeight = 1.5
diff --git a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
index e521493..e521493 100755
--- a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
diff --git a/bin/libBulletSim-x86_64.so b/bin/libBulletSim-x86_64.so
new file mode 100755
index 0000000..cd2db40
--- /dev/null
+++ b/bin/libBulletSim-x86_64.so
Binary files differ
author	Justin Clark-Casey (justincc)	2011-08-30 22:07:32 +0100
committer	Justin Clark-Casey (justincc)	2011-08-30 22:07:32 +0100
commit	953611af53d12bad8b2f25427505e0bdadeda366 (patch)
tree	494e1723c26193fbf0020be1a6ff6c82b7b29f71
parent	Fix bug where attachments were remaining on the avatar after being dropped. (diff)
parent	BulletSim: update values in OpenSimDefaults.ini to the same as defaults in th... (diff)
download	opensim-SC_OLD-953611af53d12bad8b2f25427505e0bdadeda366.zip opensim-SC_OLD-953611af53d12bad8b2f25427505e0bdadeda366.tar.gz opensim-SC_OLD-953611af53d12bad8b2f25427505e0bdadeda366.tar.bz2 opensim-SC_OLD-953611af53d12bad8b2f25427505e0bdadeda366.tar.xz

diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll index a25b93b..6620759 100755 --- a/bin/BulletSim-x86_64.dll +++ b/bin/BulletSim-x86_64.dll
Binary files differ


diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll index efd420a..ffb5380 100755 --- a/bin/BulletSim.dll +++ b/bin/BulletSim.dll
Binary files differ


diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index f1c0aab..ca4fbfb 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini
@@ -736,15 +736,15 @@
736		736
737	[BulletSim]	737	[BulletSim]
738	; World parameters	738	; World parameters
739	DefaultFriction = 0.70	739	DefaultFriction = 0.50
740	DefaultDensity = 10.000006836	740	DefaultDensity = 10.000006836
741	DefaultRestitution = 0.0	741	DefaultRestitution = 0.0
742	Gravity = -9.80665	742	Gravity = -9.80665
743		743
744	TerrainFriction = 0.85	744	TerrainFriction = 0.50
745	TerrainHitFriction = 0.8	745	TerrainHitFriction = 0.8
746	TerrainRestitution = 0.2	746	TerrainRestitution = 0
747	AvatarFriction = 0.85	747	AvatarFriction = 0
748	AvatarDensity = 60.0	748	AvatarDensity = 60.0
749	AvatarCapsuleRadius = 0.37	749	AvatarCapsuleRadius = 0.37
750	AvatarCapsuleHeight = 1.5	750	AvatarCapsuleHeight = 1.5


diff --git a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config index e521493..e521493 100755 --- a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config +++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config


diff --git a/bin/libBulletSim-x86_64.so b/bin/libBulletSim-x86_64.so new file mode 100755 index 0000000..cd2db40 --- /dev/null +++ b/bin/libBulletSim-x86_64.so
Binary files differ