diff options
author | John Hurliman | 2009-10-16 15:50:22 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-16 15:50:22 -0700 |
commit | f3f93228e02d9fae5baa55a7dd3de4ff7a630db3 (patch) | |
tree | f16587f7c168f5599335a92500239ec90ae1eedc /OpenSim | |
parent | Reverting the previous ugly hack and replacing it with try/catch statements f... (diff) | |
download | opensim-SC_OLD-f3f93228e02d9fae5baa55a7dd3de4ff7a630db3.zip opensim-SC_OLD-f3f93228e02d9fae5baa55a7dd3de4ff7a630db3.tar.gz opensim-SC_OLD-f3f93228e02d9fae5baa55a7dd3de4ff7a630db3.tar.bz2 opensim-SC_OLD-f3f93228e02d9fae5baa55a7dd3de4ff7a630db3.tar.xz |
Changing the region module loading foreach loops to typecast things to the IRegionModuleBase interface where AddRegion(), RegionLoaded(), etc. actually exist. Shot in the dark at fixing the Mono issue
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs index 518982e..a868bd0 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | |||
@@ -268,7 +268,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController | |||
268 | deferredlist.Add(module); | 268 | deferredlist.Add(module); |
269 | } | 269 | } |
270 | 270 | ||
271 | foreach (INonSharedRegionModule module in deferredlist) | 271 | foreach (IRegionModuleBase module in deferredlist) |
272 | { | 272 | { |
273 | module.AddRegion(scene); | 273 | module.AddRegion(scene); |
274 | scene.AddRegionModule(module.Name, module); | 274 | scene.AddRegionModule(module.Name, module); |
@@ -284,13 +284,13 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController | |||
284 | // and unneccessary caching logic repeated in all modules. | 284 | // and unneccessary caching logic repeated in all modules. |
285 | // The extra function stub is just that much cleaner | 285 | // The extra function stub is just that much cleaner |
286 | // | 286 | // |
287 | foreach (ISharedRegionModule module in sharedlist) | 287 | foreach (IRegionModuleBase module in sharedlist) |
288 | { | 288 | { |
289 | try { module.RegionLoaded(scene); } | 289 | try { module.RegionLoaded(scene); } |
290 | catch (Exception ex) { m_log.Error("[REGIONMODULE]: Exception while loading shared region module " + module + ": " + ex.Message, ex); } | 290 | catch (Exception ex) { m_log.Error("[REGIONMODULE]: Exception while loading shared region module " + module + ": " + ex.Message, ex); } |
291 | } | 291 | } |
292 | 292 | ||
293 | foreach (INonSharedRegionModule module in list) | 293 | foreach (IRegionModuleBase module in list) |
294 | { | 294 | { |
295 | try { 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); } | 296 | catch (Exception ex) { m_log.Error("[REGIONMODULE]: Exception while loading non-shared region module " + module + ": " + ex.Message, ex); } |