From c3712a56f51bccd59958ba4d7806e8205e6f7117 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 16 Oct 2009 15:34:27 -0700
Subject: A very ugly and temporary hack to disable the RegionCombinerModule
 RegionLoaded from firing for testing

---
 .../RegionModulesController/RegionModulesControllerPlugin.cs  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/RegionModulesController')

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