4 files changed, 18 insertions, 12 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
index d2278bc..deec444 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -66,12 +66,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
 
         public void Initialise(IConfigSource source)
         {
-            IConfig startupConfig = source.Configs["Startup"];
-            if (startupConfig == null)
+            IConfig meshConfig = source.Configs["Mesh"];
+            if (meshConfig == null)
                 return;
 
-            if (!startupConfig.GetBoolean("ColladaMesh",true))
-                m_enabled = false;
+            m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
         }
 
         public void AddRegion(Scene pScene)
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
index fb07cc9..d651cb2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
@@ -68,12 +68,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
 
         public void Initialise(IConfigSource source)
         {
-            IConfig startupConfig = source.Configs["Startup"];
-            if (startupConfig == null)
+            IConfig meshConfig = source.Configs["Mesh"];
+            if (meshConfig == null)
                 return;
 
-            if (!startupConfig.GetBoolean("ColladaMesh",true))
-                m_enabled = false;
+            m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
         }
 
         public void AddRegion(Scene pScene)
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index a12931f..6b24718 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -82,6 +82,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </summary>
         public bool ControlFileLoaded { get; private set; }
         
+        /// <summary>
+        /// Do we want to enforce the check.  IAR versions before 0.2 and 1.1 do not guarantee this order, so we can't
+        /// enforce.
+        /// </summary>
+        public bool EnforceControlFileCheck { get; private set; }
+        
         protected bool m_assetsLoaded;
         protected bool m_inventoryNodesLoaded;
         
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2e0a22b..e72e851 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