1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index fc59b82..a8b6682 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -286,8 +286,15 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             //
             foreach (ISharedRegionModule module in sharedlist)
             {
-                m_log.Debug("[REGIONMODULE]: Calling RegionLoaded for " + module);
-                module.RegionLoaded(scene);
+                if (!module.ToString().Contains("RegionCombinerModule"))
+                {
+                    m_log.Debug("[REGIONMODULE]: Calling RegionLoaded for " + module);
+                    module.RegionLoaded(scene);
+                }
+                else
+                {
+                    m_log.Debug("[REGIONMODULE]: Skipping RegionCombinerModule");
+                }
             }
 
             foreach (INonSharedRegionModule module in list)