aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authoropensim mirror account2010-12-03 17:10:03 -0800
committeropensim mirror account2010-12-03 17:10:03 -0800
commit935929c2b8f2b5c09c0a3b39bba859bab1049781 (patch)
tree42ac8bcab0a7f410dc39434237fed40ad730fbc3 /OpenSim/Region/Application/OpenSimBase.cs
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentadd warning decals and information to RegionModule.cs in probably non-functi... (diff)
downloadopensim-SC_OLD-935929c2b8f2b5c09c0a3b39bba859bab1049781.zip
opensim-SC_OLD-935929c2b8f2b5c09c0a3b39bba859bab1049781.tar.gz
opensim-SC_OLD-935929c2b8f2b5c09c0a3b39bba859bab1049781.tar.bz2
opensim-SC_OLD-935929c2b8f2b5c09c0a3b39bba859bab1049781.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 36d5e51..eee2300 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("[REGIONMODULE]: 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("[REGIONMODULE]: 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