5 files changed, 48 insertions, 0 deletions

diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll
new file mode 100755
index 0000000..750b2f5
--- /dev/null
+++ b/bin/BulletSim-x86_64.dll
diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll
new file mode 100755
index 0000000..d5c76da
--- /dev/null
+++ b/bin/BulletSim.dll
diff --git a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config
new file mode 100755
index 0000000..e521493
--- /dev/null
+++ b/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config
@@ -0,0 +1,6 @@
+<configuration>
+  <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" />
+  <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" />
+  <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="libBulletSim" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="libBulletSim-x86_64" />
+</configuration>
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 23218f1..2877541 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -164,6 +164,7 @@
     ;physics = basicphysics
     ;physics = POS
     ;physics = modified_BulletX
+    ;physics = BulletSim
 
     ; ##
     ; ## PERMISSIONS
@@ -730,6 +731,47 @@
     ; true. Note that this will increase memory usage and region startup time. Default is false.
     ;force_simple_prim_meshing = true
 
+[BulletSim]
+    ; World parameters
+    DefaultFriction = 0.70
+    DefaultDensity = 10.000006836
+    DefaultRestitution = 0.0
+    Gravity = -9.80665
+
+    TerrainFriction = 0.85
+    TerrainHitFriction = 0.8
+    TerrainRestitution = 0.2
+    AvatarFriction = 0.85
+    AvatarDensity = 60.0
+    AvatarCapsuleRadius = 0.37
+    AvatarCapsuleHeight = 1.5
+
+    MaxObjectMass = 10000.01
+
+    ; Dynamic parameters
+    LinearDamping = 0.0
+    AngularDamping = 0.0
+    DeactivationTime = 0.2
+    LinearSleepingThreshold = 0.8
+    AngularSleepingThreshold = 1.0
+    CcdMotionThreshold = 0.5
+    CcdSweptSphereRadius = 0.2
+
+    ; Whether to mesh sculpties
+    MeshSculptedPrim = true
+
+    ; If 'true', force simple prims (box and sphere) to be meshed
+    ForceSimplePrimMeshing = false
+
+    ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
+    MeshLevelOfDetail = 32
+
+    ; Bullet step parameters
+    MaxSubSteps = 10;
+    FixedTimeStep = .01667
+
+    MaxCollisionsPerFrame = 2048
+    MaxUpdatesPerFrame = 2048
 
 [RemoteAdmin]
     enabled = false
diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so
new file mode 100755
index 0000000..275355d
--- /dev/null
+++ b/bin/libBulletSim.so