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

@@ -111,14 +111,12 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
{
if ((SMTPConfig = m_Config.Configs["SMTP"]) == null)
{
m_log.InfoFormat("[SMTP] SMTP server not configured");
m_Enabled = false;
return;
}
if (!SMTPConfig.GetBoolean("enabled", false))
{
m_log.InfoFormat("[SMTP] module disabled in configuration");
m_Enabled = false;
return;
}