Merge branch 'master' into careminster

1 files changed, 3 insertions, 4 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6e6e4eb..07e7533 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -637,13 +637,12 @@
 [Mesh]
     ; enable / disable Collada mesh support
     ; default is true
-    ; AllowMeshUpload = true
+    AllowMeshUpload = true
 
     ; if you use Meshmerizer and want collisions for meshies, setting this to true
     ; will cause OpenSim to attempt to decode meshies assets, extract the physics
-    ; mesh, and use it for collisions. This is currently experimental code and enabling
-    ; it may cause unexpected physics problems.
-    ;UseMeshiesPhysicsMesh = false
+    ; mesh, and use it for collisions. 
+    UseMeshiesPhysicsMesh = true
 
 
 [ODEPhysicsSettings]