Add ColladaMesh switch

3 files changed, 26 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
index 878242a..d2278bc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
         
         private Scene m_scene;
         private IAssetService m_assetService;
+        private bool m_enabled = true;
 
         #region IRegionModuleBase Members
 
@@ -65,7 +66,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
 
         public void Initialise(IConfigSource source)
         {
-           
+            IConfig startupConfig = source.Configs["Startup"];
+            if (startupConfig == null)
+                return;
+
+            if (!startupConfig.GetBoolean("ColladaMesh",true))
+                m_enabled = false;
         }
 
         public void AddRegion(Scene pScene)
@@ -101,16 +107,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
+            if(!m_enabled)
+                return;
+
             UUID capID = UUID.Random();
 
 //            m_log.Info("[GETMESH]: /CAPS/" + capID);
+
             caps.RegisterHandler("GetMesh",
                                  new RestHTTPHandler("GET", "/CAPS/" + capID,
                                                        delegate(Hashtable m_dhttpMethod)
                                                        {
                                                            return ProcessGetMesh(m_dhttpMethod, agentID, caps);
                                                        }));
-         
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
index 4a42c93..fb07cc9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
@@ -56,6 +56,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
         private Scene m_scene;
 //        private IAssetService m_assetService;
         private bool m_dumpAssetsToFile = false;
+        private bool m_enabled = true;
 
         #region IRegionModuleBase Members
 
@@ -67,7 +68,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
 
         public void Initialise(IConfigSource source)
         {
-           
+            IConfig startupConfig = source.Configs["Startup"];
+            if (startupConfig == null)
+                return;
+
+            if (!startupConfig.GetBoolean("ColladaMesh",true))
+                m_enabled = false;
         }
 
         public void AddRegion(Scene pScene)
@@ -103,6 +109,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
+            if(!m_enabled)
+                return;
+
             UUID capID = UUID.Random();
 
 //            m_log.Debug("[NEW FILE AGENT INVENTORY VARIABLE PRICE]: /CAPS/" + capID);
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