OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
parent 29aaf5564f e26d0ee40a
commit a6012a3fae
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
View File

@ -61,18 +61,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{ {
m_config = config.Configs["Chat"]; m_config = config.Configs["Chat"];
if (null == m_config) if (m_config != null)
{ {
m_log.Info("[CHAT]: no config found, plugin disabled"); if (!m_config.GetBoolean("enabled", true))
m_enabled = false; {
return; 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); m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);