1 files changed, 28 insertions, 10 deletions

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index afb788b..e95889d 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -50,7 +50,7 @@ using Ionic.Zlib;
 // specify its assembly.  Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans
 // the available DLLs
 //[assembly: Addin("MaterialsModule", "1.0")]
-//[assembly: AddinDependency("OpenSim", "0.5")]
+//[assembly: AddinDependency("OpenSim", "0.8.1")]
 
 namespace OpenSim.Region.OptionalModules.Materials
 {
@@ -65,20 +65,23 @@ namespace OpenSim.Region.OptionalModules.Materials
 
         private Scene m_scene = null;
         private bool m_enabled = false;
+        private int m_maxMaterialsPerTransaction = 50;
 
         public Dictionary<UUID, OSDMap> m_regionMaterials = new Dictionary<UUID, OSDMap>();
-        
+
         public void Initialise(IConfigSource source)
         {
-            IConfig config = source.Configs["Materials"];
-            if (config == null)
-                return;
+            m_enabled = true; // default is enabled
 
-            m_enabled = config.GetBoolean("enable_materials", true);
-            if (!m_enabled)
-                return;
+            IConfig config = source.Configs["Materials"];
+            if (config != null)
+            {
+                m_enabled = config.GetBoolean("enable_materials", m_enabled);
+                m_maxMaterialsPerTransaction = config.GetInt("MaxMaterialsPerTransaction", m_maxMaterialsPerTransaction);
+            }
 
-            m_log.DebugFormat("[Materials]: Initialized");
+            if (m_enabled)
+                m_log.DebugFormat("[Materials]: Initialized");
         }
         
         public void Close()
@@ -146,6 +149,16 @@ namespace OpenSim.Region.OptionalModules.Materials
         
         public void RegionLoaded(Scene scene)
         {
+            if (!m_enabled) return;
+
+            ISimulatorFeaturesModule featuresModule = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            features["MaxMaterialsPerTransaction"] = m_maxMaterialsPerTransaction;
         }
 
         /// <summary>
@@ -216,7 +229,12 @@ namespace OpenSim.Region.OptionalModules.Materials
 
             GetLegacyStoredMaterialsInPart(part);
 
-            GetStoredMaterialInFace(part, te.DefaultTexture);
+            if (te.DefaultTexture != null)
+                GetStoredMaterialInFace(part, te.DefaultTexture);
+            else
+                m_log.WarnFormat(
+                    "[Materials]: Default texture for part {0} (part of object {1}) in {2} unexpectedly null.  Ignoring.", 
+                    part.Name, part.ParentGroup.Name, m_scene.Name);
 
             foreach (Primitive.TextureEntryFace face in te.FaceTextures)
             {