From 40bf417da7705711f33c64b82611203ff2a0adad Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 13 Apr 2011 16:10:18 -0400
Subject: Add ColladaMesh switch

---
 .../Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs')

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);
-- 
cgit v1.1


From 36c4e94ef739f2d58ff26ae2313e5a930ff02021 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 18 Apr 2011 23:22:04 +0100
Subject: Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of
 future config parameters.

Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
---
 .../Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs')

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)
-- 
cgit v1.1


From e0002f6b64e7aeb29de9f1db92ed39d3d1df578c Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 21 Apr 2011 19:04:41 -0400
Subject: some mesh config asthetics

---
 .../Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
index d651cb2..3d4c7b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
             if (meshConfig == null)
                 return;
 
-            m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
+            m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
         }
 
         public void AddRegion(Scene pScene)
-- 
cgit v1.1