Merge branch 'master' into careminster-presence-refactor

1 files changed, 6 insertions, 4 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 252ab8b..61eaf14 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -155,10 +155,6 @@
     ; 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
@@ -460,6 +456,12 @@
     CoalesceMultipleObjectsToInventory = true
 
 
+[Mesh]
+    ; enable / disable Collada mesh support
+    ; default is true
+    ColladaMesh = true
+
+
 [ODEPhysicsSettings]
     ;##
     ;## World Settings