diff options
author | Melanie | 2012-03-25 20:07:43 +0100 |
---|---|---|
committer | Melanie | 2012-03-25 20:07:43 +0100 |
commit | 44f1f876562dd41c0c619462a57d6a33731729ac (patch) | |
tree | 96c7a583dcb483f2fe8d19787a381fae1985b1b1 /OpenSim/Framework/Console | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Simplify the module invocation registration. The types and method name (diff) | |
download | opensim-SC_OLD-44f1f876562dd41c0c619462a57d6a33731729ac.zip opensim-SC_OLD-44f1f876562dd41c0c619462a57d6a33731729ac.tar.gz opensim-SC_OLD-44f1f876562dd41c0c619462a57d6a33731729ac.tar.bz2 opensim-SC_OLD-44f1f876562dd41c0c619462a57d6a33731729ac.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Console')
-rw-r--r-- | OpenSim/Framework/Console/CommandConsole.cs | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index 2bb7de1..c5d6b78 100644 --- a/OpenSim/Framework/Console/CommandConsole.cs +++ b/OpenSim/Framework/Console/CommandConsole.cs | |||
@@ -188,19 +188,21 @@ namespace OpenSim.Framework.Console | |||
188 | { | 188 | { |
189 | lock (m_modulesCommands) | 189 | lock (m_modulesCommands) |
190 | { | 190 | { |
191 | if (m_modulesCommands.ContainsKey(moduleName)) | 191 | foreach (string key in m_modulesCommands.Keys) |
192 | { | 192 | { |
193 | List<CommandInfo> commands = m_modulesCommands[moduleName]; | 193 | // Allow topic help requests to succeed whether they are upper or lowercase. |
194 | var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help)); | 194 | if (moduleName.ToLower() == key.ToLower()) |
195 | ourHelpText.Sort(); | 195 | { |
196 | helpText.AddRange(ourHelpText); | 196 | List<CommandInfo> commands = m_modulesCommands[key]; |
197 | var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help)); | ||
198 | ourHelpText.Sort(); | ||
199 | helpText.AddRange(ourHelpText); | ||
197 | 200 | ||
198 | return true; | 201 | return true; |
199 | } | 202 | } |
200 | else | ||
201 | { | ||
202 | return false; | ||
203 | } | 203 | } |
204 | |||
205 | return false; | ||
204 | } | 206 | } |
205 | } | 207 | } |
206 | 208 | ||