Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-12-03 16:00:27 -08:00
commit cc573e97d5
1 changed files with 2 additions and 2 deletions

View File

@ -352,13 +352,13 @@ namespace OpenSim
m_moduleLoader.InitialiseSharedModules(scene); m_moduleLoader.InitialiseSharedModules(scene);
// Use this in the future, the line above will be deprecated soon // Use this in the future, the line above will be deprecated soon
m_log.Info("[MODULES]: Loading Region's modules (new style)"); m_log.Info("[REGIONMODULE]: Loading Region's modules (new style)");
IRegionModulesController controller; IRegionModulesController controller;
if (ApplicationRegistry.TryGet(out controller)) if (ApplicationRegistry.TryGet(out controller))
{ {
controller.AddRegionToModules(scene); controller.AddRegionToModules(scene);
} }
else m_log.Error("[MODULES]: The new RegionModulesController is missing..."); else m_log.Error("[REGIONMODULE]: The new RegionModulesController is missing...");
scene.SetModuleInterfaces(); scene.SetModuleInterfaces();