aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-16 15:34:27 -0700
committerJohn Hurliman2009-10-16 15:34:27 -0700
commitc3712a56f51bccd59958ba4d7806e8205e6f7117 (patch)
tree9df28fd877d455670ad7ffac596fd48f29ae0675
parentAdding noisy debug for nebadon (diff)
downloadopensim-SC_OLD-c3712a56f51bccd59958ba4d7806e8205e6f7117.zip
opensim-SC_OLD-c3712a56f51bccd59958ba4d7806e8205e6f7117.tar.gz
opensim-SC_OLD-c3712a56f51bccd59958ba4d7806e8205e6f7117.tar.bz2
opensim-SC_OLD-c3712a56f51bccd59958ba4d7806e8205e6f7117.tar.xz
A very ugly and temporary hack to disable the RegionCombinerModule RegionLoaded from firing for testing
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs11
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
286 // 286 //
287 foreach (ISharedRegionModule module in sharedlist) 287 foreach (ISharedRegionModule module in sharedlist)
288 { 288 {
289 m_log.Debug("[REGIONMODULE]: Calling RegionLoaded for " + module); 289 if (!module.ToString().Contains("RegionCombinerModule"))
290 module.RegionLoaded(scene); 290 {
291 m_log.Debug("[REGIONMODULE]: Calling RegionLoaded for " + module);
292 module.RegionLoaded(scene);
293 }
294 else
295 {
296 m_log.Debug("[REGIONMODULE]: Skipping RegionCombinerModule");
297 }
291 } 298 }
292 299
293 foreach (INonSharedRegionModule module in list) 300 foreach (INonSharedRegionModule module in list)