aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorMelanie2010-12-04 04:25:39 +0000
committerMelanie2010-12-04 04:25:39 +0000
commit349767f8a2728c6c5ca072035e53ed916fe4d6c0 (patch)
tree42ede1ae3a91aa424468fbc3d8910c84a10328e8 /OpenSim/Region/Application/OpenSimBase.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-349767f8a2728c6c5ca072035e53ed916fe4d6c0.zip
opensim-SC_OLD-349767f8a2728c6c5ca072035e53ed916fe4d6c0.tar.gz
opensim-SC_OLD-349767f8a2728c6c5ca072035e53ed916fe4d6c0.tar.bz2
opensim-SC_OLD-349767f8a2728c6c5ca072035e53ed916fe4d6c0.tar.xz
Merge branch 'master' into careminster-presence-refactor
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 06b4aea..6a7272d 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -361,13 +361,13 @@ namespace OpenSim
361 m_moduleLoader.InitialiseSharedModules(scene); 361 m_moduleLoader.InitialiseSharedModules(scene);
362 362
363 // Use this in the future, the line above will be deprecated soon 363 // Use this in the future, the line above will be deprecated soon
364 m_log.Info("[REGIONMODULE]: Loading Region's modules (new style)"); 364 m_log.Info("[REGIONMODULES]: Loading Region's modules (new style)");
365 IRegionModulesController controller; 365 IRegionModulesController controller;
366 if (ApplicationRegistry.TryGet(out controller)) 366 if (ApplicationRegistry.TryGet(out controller))
367 { 367 {
368 controller.AddRegionToModules(scene); 368 controller.AddRegionToModules(scene);
369 } 369 }
370 else m_log.Error("[REGIONMODULE]: The new RegionModulesController is missing..."); 370 else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing...");
371 371
372 if (m_securePermissionsLoading) 372 if (m_securePermissionsLoading)
373 { 373 {