diff options
author | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
---|---|---|
committer | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
commit | 45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a (patch) | |
tree | 0351fb2c756a46d522fe41798c3969e020a3258d /OpenSim/Region/Application/OpenSimBase.cs | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
download | opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.zip opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.gz opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.bz2 opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.xz |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 904a50c..1652b82 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -352,13 +352,13 @@ namespace OpenSim | |||
352 | m_moduleLoader.InitialiseSharedModules(scene); | 352 | m_moduleLoader.InitialiseSharedModules(scene); |
353 | 353 | ||
354 | // Use this in the future, the line above will be deprecated soon | 354 | // Use this in the future, the line above will be deprecated soon |
355 | m_log.Info("[MODULES]: Loading Region's modules (new style)"); | 355 | m_log.Info("[REGIONMODULES]: Loading Region's modules (new style)"); |
356 | IRegionModulesController controller; | 356 | IRegionModulesController controller; |
357 | if (ApplicationRegistry.TryGet(out controller)) | 357 | if (ApplicationRegistry.TryGet(out controller)) |
358 | { | 358 | { |
359 | controller.AddRegionToModules(scene); | 359 | controller.AddRegionToModules(scene); |
360 | } | 360 | } |
361 | else m_log.Error("[MODULES]: The new RegionModulesController is missing..."); | 361 | else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing..."); |
362 | 362 | ||
363 | scene.SetModuleInterfaces(); | 363 | scene.SetModuleInterfaces(); |
364 | 364 | ||