OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

prioritization
John Hurliman 2009-10-16 15:44:20 -07:00
parent c3712a56f5
commit c04ffe5c94
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
View File

@ -286,20 +286,14 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
// //
foreach (ISharedRegionModule module in sharedlist) foreach (ISharedRegionModule module in sharedlist)
{ {
if (!module.ToString().Contains("RegionCombinerModule")) try { module.RegionLoaded(scene); }
{ catch (Exception ex) { m_log.Error("[REGIONMODULE]: Exception while loading shared region module " + module + ": " + ex.Message, ex); }
m_log.Debug("[REGIONMODULE]: Calling RegionLoaded for " + module);
module.RegionLoaded(scene);
}
else
{
m_log.Debug("[REGIONMODULE]: Skipping RegionCombinerModule");
}
} }
foreach (INonSharedRegionModule module in list) 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); }
} }
} }