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

1 files changed, 11 insertions, 2 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