Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-04-03 14:16:28 +01:00
9 changed files with 133 additions and 53 deletions

View File

@@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
if (source.Configs["MRM"].GetBoolean("Enabled", false))
{
m_log.Info("[MRM] Enabling MRM Module");
m_log.Info("[MRM]: Enabling MRM Module");
m_scene = scene;
// when hidden, we don't listen for client initiated script events
@@ -90,14 +90,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
scene.RegisterModuleInterface<IMRMModule>(this);
}
else
{
m_log.Info("[MRM] Disabled MRM Module (Disabled in ini)");
}
}
else
{
m_log.Info("[MRM] Disabled MRM Module (Default disabled)");
}
}