ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-12-04 04:25:39 +00:00
parent bab6b6cd87 89fec4ff5b
commit 349767f8a2
5 changed files with 235 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Application/OpenSimBase.cs
View File

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