aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-16 15:44:20 -0700
committerJohn Hurliman2009-10-16 15:44:20 -0700
commitc04ffe5c94a3929c05329dcaf895c426c506eb65 (patch)
tree7489c5384663c571fe6b15c9e9c51f7a6c95c59d
parentA very ugly and temporary hack to disable the RegionCombinerModule RegionLoad... (diff)
downloadopensim-SC_OLD-c04ffe5c94a3929c05329dcaf895c426c506eb65.zip
opensim-SC_OLD-c04ffe5c94a3929c05329dcaf895c426c506eb65.tar.gz
opensim-SC_OLD-c04ffe5c94a3929c05329dcaf895c426c506eb65.tar.bz2
opensim-SC_OLD-c04ffe5c94a3929c05329dcaf895c426c506eb65.tar.xz
Reverting the previous ugly hack and replacing it with try/catch statements for each RegionLoaded() call. This probably won't fix nebadon's crash, but it seems like a good idea
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs14
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index a8b6682..518982e 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -286,20 +286,14 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
286 // 286 //
287 foreach (ISharedRegionModule module in sharedlist) 287 foreach (ISharedRegionModule module in sharedlist)
288 { 288 {
289 if (!module.ToString().Contains("RegionCombinerModule")) 289 try { module.RegionLoaded(scene); }
290 { 290 catch (Exception ex) { m_log.Error("[REGIONMODULE]: Exception while loading shared region module " + module + ": " + ex.Message, ex); }
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 }
298 } 291 }
299 292
300 foreach (INonSharedRegionModule module in list) 293 foreach (INonSharedRegionModule module in list)
301 { 294 {
302 module.RegionLoaded(scene); 295 try { module.RegionLoaded(scene); }
296 catch (Exception ex) { m_log.Error("[REGIONMODULE]: Exception while loading non-shared region module " + module + ": " + ex.Message, ex); }
303 } 297 }
304 } 298 }
305 299