diff options
| author | Diva Canto | 2015-09-11 09:49:33 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-09-11 09:49:33 -0700 |
| commit | a6012a3faefeb61cb53651c2a587e585f96f1012 (patch) | |
| tree | 14b5fa34a698920078f445741eca886367122a4e /OpenSim/Region | |
| parent | Mantis #7720: AssetXferUploader was setting AssetID to UUID.Zero. Before that... (diff) | |
| parent | Make sure the chat module doesn't deactivate just because the section (diff) | |
| download | opensim-SC-a6012a3faefeb61cb53651c2a587e585f96f1012.zip opensim-SC-a6012a3faefeb61cb53651c2a587e585f96f1012.tar.gz opensim-SC-a6012a3faefeb61cb53651c2a587e585f96f1012.tar.bz2 opensim-SC-a6012a3faefeb61cb53651c2a587e585f96f1012.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 20 |
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 | } |