diff options
author | Justin Clark-Casey (justincc) | 2009-11-25 16:23:37 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-25 16:23:37 +0000 |
commit | 40464f6cc6ffc04bb5e4ede3d832e1cde75e9b5b (patch) | |
tree | dff2c717128481e2def195fc7eb8d71b76410024 /OpenSim | |
parent | minor: remove some mono compiler warnings, add --merge load oar switch to hel... (diff) | |
download | opensim-SC_OLD-40464f6cc6ffc04bb5e4ede3d832e1cde75e9b5b.zip opensim-SC_OLD-40464f6cc6ffc04bb5e4ede3d832e1cde75e9b5b.tar.gz opensim-SC_OLD-40464f6cc6ffc04bb5e4ede3d832e1cde75e9b5b.tar.bz2 opensim-SC_OLD-40464f6cc6ffc04bb5e4ede3d832e1cde75e9b5b.tar.xz |
Change chat config code so that enabled = false actually does disable the chat module
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index f4da910..6dacbba 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -62,15 +62,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
62 | if (null == m_config) | 62 | if (null == m_config) |
63 | { | 63 | { |
64 | m_log.Info("[CHAT]: no config found, plugin disabled"); | 64 | m_log.Info("[CHAT]: no config found, plugin disabled"); |
65 | m_enabled = false; | ||
65 | return; | 66 | return; |
66 | } | 67 | } |
67 | 68 | ||
68 | if (!m_config.GetBoolean("enabled", false)) | 69 | if (!m_config.GetBoolean("enabled", true)) |
69 | { | 70 | { |
70 | m_log.Info("[CHAT]: plugin disabled by configuration"); | 71 | m_log.Info("[CHAT]: plugin disabled by configuration"); |
72 | m_enabled = false; | ||
71 | return; | 73 | return; |
72 | } | 74 | } |
73 | m_enabled = true; | ||
74 | 75 | ||
75 | m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); | 76 | m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); |
76 | m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); | 77 | m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); |