aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorMelanie2010-12-04 04:25:08 +0000
committerMelanie2010-12-04 04:25:08 +0000
commit89fec4ff5b57d5bb6ac9997d517c9308d01d96e4 (patch)
treed7de55ec34f769e0536f63e81c1465ab6feac328 /OpenSim/Region/Application/OpenSimBase.cs
parentConvert the agent asset transactions module to a new style module. (diff)
parentminor: add class doc line to older region module example code pointing toward... (diff)
downloadopensim-SC-89fec4ff5b57d5bb6ac9997d517c9308d01d96e4.zip
opensim-SC-89fec4ff5b57d5bb6ac9997d517c9308d01d96e4.tar.gz
opensim-SC-89fec4ff5b57d5bb6ac9997d517c9308d01d96e4.tar.bz2
opensim-SC-89fec4ff5b57d5bb6ac9997d517c9308d01d96e4.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/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