From e26d0ee40ac904e57a52e4b4e51f1a120f4184d1 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Wed, 9 Sep 2015 05:40:39 +0200 Subject: [PATCH] Make sure the chat module doesn't deactivate just because the section heading is missing --- .../CoreModules/Avatar/Chat/ChatModule.cs | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index a9d2de0b20..f0b1e6747b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -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 } -} \ No newline at end of file +}