diff options
Diffstat (limited to 'OpenSim/Framework/Console/CommandConsole.cs')
-rw-r--r-- | OpenSim/Framework/Console/CommandConsole.cs | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index d908b68..6b7cdf8 100644 --- a/OpenSim/Framework/Console/CommandConsole.cs +++ b/OpenSim/Framework/Console/CommandConsole.cs | |||
@@ -83,8 +83,8 @@ namespace OpenSim.Framework.Console | |||
83 | = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n"; | 83 | = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n"; |
84 | 84 | ||
85 | public const string ItemHelpText | 85 | public const string ItemHelpText |
86 | = @"For more information, type 'help ' to get a list of all commands, | 86 | = @"For more information, type 'help all' to get a list of all commands, |
87 | or type help <item>' where <item> is one of the following:"; | 87 | or type help <item>' where <item> is one of the following:"; |
88 | 88 | ||
89 | /// <value> | 89 | /// <value> |
90 | /// Commands organized by keyword in a tree | 90 | /// Commands organized by keyword in a tree |
@@ -116,15 +116,13 @@ namespace OpenSim.Framework.Console | |||
116 | if (helpParts.Count == 0) | 116 | if (helpParts.Count == 0) |
117 | { | 117 | { |
118 | help.Add(GeneralHelpText); | 118 | help.Add(GeneralHelpText); |
119 | help.AddRange(CollectAllCommandsHelp()); | ||
120 | } | ||
121 | else if (helpParts.Count == 1 && helpParts[0] == "categories") | ||
122 | { | ||
123 | help.Add(""); // Will become a newline. | ||
124 | help.Add(GeneralHelpText); | ||
125 | help.Add(ItemHelpText); | 119 | help.Add(ItemHelpText); |
126 | help.AddRange(CollectModulesHelp(tree)); | 120 | help.AddRange(CollectModulesHelp(tree)); |
127 | } | 121 | } |
122 | else if (helpParts.Count == 1 && helpParts[0] == "all") | ||
123 | { | ||
124 | help.AddRange(CollectAllCommandsHelp()); | ||
125 | } | ||
128 | else | 126 | else |
129 | { | 127 | { |
130 | help.AddRange(CollectHelp(helpParts)); | 128 | help.AddRange(CollectHelp(helpParts)); |
@@ -147,11 +145,8 @@ namespace OpenSim.Framework.Console | |||
147 | { | 145 | { |
148 | foreach (List<CommandInfo> commands in m_modulesCommands.Values) | 146 | foreach (List<CommandInfo> commands in m_modulesCommands.Values) |
149 | { | 147 | { |
150 | foreach (CommandInfo c in commands) | 148 | var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help)); |
151 | { | 149 | help.AddRange(ourHelpText); |
152 | if (c.long_help != String.Empty) | ||
153 | help.Add(string.Format("{0} - {1}", c.help_text, c.long_help)); | ||
154 | } | ||
155 | } | 150 | } |
156 | } | 151 | } |
157 | 152 | ||