Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs

5 files changed, 2 insertions, 14 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2edc1f8..6409cdb 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -912,13 +912,9 @@
 
     ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain.  If you're using the bulletxna engine, 
     ;  you will want to switch to the heightfield option
-
     TerrainImplementation = 1
     ; TerrainImplementation = 0
 
-    DefaultFriction = 0.20
-    DefaultDensity = 10.000006836
-    DefaultRestitution = 0.0
     Gravity = -9.80665
 
     TerrainFriction = 0.30
@@ -927,7 +923,7 @@
     TerrainCollisionMargin = 0.04
 
     AvatarFriction = 0.2
-    AvatarStandingFriction = 10.0
+    AvatarStandingFriction = 0.95
     AvatarRestitution = 0.0
     AvatarDensity = 3.5
     AvatarCapsuleWidth = 0.6
@@ -939,7 +935,7 @@
 
     CollisionMargin = 0.04
 
-    ; Linkset constraint parameters
+    ; Linkset implmentation
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
     ; Whether to mesh sculpties
@@ -948,14 +944,6 @@
     ; If 'true', force simple prims (box and sphere) to be meshed
     ForceSimplePrimMeshing = false
 
-    ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail
-    MeshLevelOfDetail = 8
-    ; if mesh size is > threshold meters, we need to add more detail because people will notice
-    MeshLevelOfDetailMegaPrimThreshold = 10
-    MeshLevelOfDetailMegaPrim = 16
-    ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
-    SculptLevelOfDetail = 32
-
     ; Bullet step parameters
     MaxSubSteps = 10
     FixedTimeStep = .01667
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 24dffac..de4f95a 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 7e3ed20..674a08a 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 808f433..1c55b19 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 9382751..e2fc8bd 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so