From c04ffe5c94a3929c05329dcaf895c426c506eb65 Mon Sep 17 00:00:00 2001
From: John Hurliman <jhurliman@jhurliman.org>
Date: Fri, 16 Oct 2009 15:44:20 -0700
Subject: [PATCH] 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

---
 .../RegionModulesControllerPlugin.cs               | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index a8b6682dfa..518982ee9e 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -286,20 +286,14 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             //
             foreach (ISharedRegionModule module in sharedlist)
             {
-                if (!module.ToString().Contains("RegionCombinerModule"))
-                {
-                    m_log.Debug("[REGIONMODULE]: Calling RegionLoaded for " + module);
-                    module.RegionLoaded(scene);
-                }
-                else
-                {
-                    m_log.Debug("[REGIONMODULE]: Skipping RegionCombinerModule");
-                }
+                try { module.RegionLoaded(scene); }
+                catch (Exception ex) { m_log.Error("[REGIONMODULE]: Exception while loading shared region module " + module + ": " + ex.Message, ex); }
             }
 
             foreach (INonSharedRegionModule module in list)
             {
-                module.RegionLoaded(scene);
+                try { module.RegionLoaded(scene); }
+                catch (Exception ex) { m_log.Error("[REGIONMODULE]: Exception while loading non-shared region module " + module + ": " + ex.Message, ex); }
             }
         }