Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.8.2-post-fixes
Diva Canto 2015-09-11 09:49:33 -07:00
commit a6012a3fae
1 changed files with 8 additions and 12 deletions

View File

@ -61,18 +61,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{
m_config = config.Configs["Chat"];
if (null == m_config)
if (m_config != null)
{
m_log.Info("[CHAT]: no config found, plugin disabled");
m_enabled = false;
return;
}
if (!m_config.GetBoolean("enabled", true))
{
m_log.Info("[CHAT]: plugin disabled by configuration");
m_enabled = false;
return;
if (!m_config.GetBoolean("enabled", true))
{
m_log.Info("[CHAT]: plugin disabled by configuration");
m_enabled = false;
return;
}
}
m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
@ -392,4 +388,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
#endregion
}
}
}