aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2015-09-09 05:40:39 +0200
committerMelanie Thielker2015-09-09 05:40:39 +0200
commite26d0ee40ac904e57a52e4b4e51f1a120f4184d1 (patch)
treed4c0ebc531e6150ae16a5b45d496d2bdb1bc9101 /OpenSim
parentDeleted access control spec from [LoginService] section of standalone config.... (diff)
downloadopensim-SC-e26d0ee40ac904e57a52e4b4e51f1a120f4184d1.zip
opensim-SC-e26d0ee40ac904e57a52e4b4e51f1a120f4184d1.tar.gz
opensim-SC-e26d0ee40ac904e57a52e4b4e51f1a120f4184d1.tar.bz2
opensim-SC-e26d0ee40ac904e57a52e4b4e51f1a120f4184d1.tar.xz
Make sure the chat module doesn't deactivate just because the section
heading is missing
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs20
1 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index a9d2de0..f0b1e67 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
61 { 61 {
62 m_config = config.Configs["Chat"]; 62 m_config = config.Configs["Chat"];
63 63
64 if (null == m_config) 64 if (m_config != null)
65 { 65 {
66 m_log.Info("[CHAT]: no config found, plugin disabled"); 66 if (!m_config.GetBoolean("enabled", true))
67 m_enabled = false; 67 {
68 return; 68 m_log.Info("[CHAT]: plugin disabled by configuration");
69 } 69 m_enabled = false;
70 70 return;
71 if (!m_config.GetBoolean("enabled", true)) 71 }
72 {
73 m_log.Info("[CHAT]: plugin disabled by configuration");
74 m_enabled = false;
75 return;
76 } 72 }
77 73
78 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); 74 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
@@ -392,4 +388,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
392 388
393 #endregion 389 #endregion
394 } 390 }
395} \ No newline at end of file 391}