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

1 files changed, 5 insertions, 1 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index f857b8d..107e859 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -154,7 +154,11 @@
     ; mesh, and use it for collisions. This is currently experimental code and enabling
     ; it may cause unexpected physics problems.
     ;UseMeshiesPhysicsMesh = false
-    
+
+    ; enable / disable Collada mesh support
+    ; default is true
+    ; ColladaMesh = true
+
     ; Choose one of the physics engines below
     ; OpenDynamicsEngine is by some distance the most developed physics engine
     ; basicphysics effectively does not model physics at all, making all objects phantom