2 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 3ce6178..9413f09 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -65,6 +65,7 @@ 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>();
 
@@ -74,7 +75,10 @@ namespace OpenSim.Region.OptionalModules.Materials
 
             IConfig config = source.Configs["Materials"];
             if (config != null)
+            {
                 m_enabled = config.GetBoolean("enable_materials", m_enabled);
+                m_maxMaterialsPerTransaction = config.GetInt("MaxMaterialsPerTransaction", m_maxMaterialsPerTransaction);
+            }
 
             if (m_enabled)
                 m_log.DebugFormat("[Materials]: Initialized");
@@ -145,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>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 28a8dc2..7a1a88d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -789,7 +789,7 @@
     ;# {enable_materials} {} {Enable Materials support?} {true false} true
     ;; This enables the use of Materials.
     ; enable_materials = true
-
+    ; MaxMaterialsPerTransaction = 50
 
 [DataSnapshot]
     ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false