From b281163457fe40f14b2a5434296cd87816307657 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 30 Aug 2011 13:19:53 -0700
Subject: BulletSim: add .so for 64 bit Linux. Move .config file to where it
will be read.
---
bin/BulletSim-x86_64.dll | Bin 784384 -> 784384 bytes
bin/BulletSim.dll | Bin 676352 -> 676352 bytes
...OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 ------
...OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 ++++++
bin/libBulletSim-x86_64.so | Bin 0 -> 2005396 bytes
5 files changed, 6 insertions(+), 6 deletions(-)
delete mode 100755 bin/OpenSim.Region.Physics.BulletSPlugin.dll.config
create mode 100755 bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
create mode 100755 bin/libBulletSim-x86_64.so
(limited to 'bin')
diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll
index a25b93b..6620759 100755
Binary files a/bin/BulletSim-x86_64.dll and b/bin/BulletSim-x86_64.dll differ
diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll
index efd420a..ffb5380 100755
Binary files a/bin/BulletSim.dll and b/bin/BulletSim.dll differ
diff --git a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config
deleted file mode 100755
index e521493..0000000
--- a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
new file mode 100755
index 0000000..e521493
--- /dev/null
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/bin/libBulletSim-x86_64.so b/bin/libBulletSim-x86_64.so
new file mode 100755
index 0000000..cd2db40
Binary files /dev/null and b/bin/libBulletSim-x86_64.so differ
--
cgit v1.1
From b705ad477e2d1baa683f24ba6ed6c0738cc7f39b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 30 Aug 2011 13:49:50 -0700
Subject: BulletSim: update values in OpenSimDefaults.ini to the same as
defaults in the source.
---
bin/OpenSimDefaults.ini | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'bin')
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
- AvatarFriction = 0.85
+ TerrainRestitution = 0
+ AvatarFriction = 0
AvatarDensity = 60.0
AvatarCapsuleRadius = 0.37
AvatarCapsuleHeight = 1.5
--
cgit v1.1