Revert help to display a full command list. Leave the help categories in as

"help categories" in case it turns out useful in the future. May not work.
avinationmerge
Melanie 2012-11-23 02:04:24 +00:00
parent b09fb01571
commit 2e7b72d3da
1 changed files with 6 additions and 5 deletions

View File

@ -83,7 +83,7 @@ namespace OpenSim.Framework.Console
= "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n"; = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n";
public const string ItemHelpText public const string ItemHelpText
= @"For more information, type 'help all' to get a list of all commands, = @"For more information, type 'help' to get a list of all commands,
or type help <item>' where <item> is one of the following:"; or type help <item>' where <item> is one of the following:";
/// <value> /// <value>
@ -112,16 +112,17 @@ namespace OpenSim.Framework.Console
// General help // General help
if (helpParts.Count == 0) if (helpParts.Count == 0)
{
help.Add(GeneralHelpText);
help.AddRange(CollectAllCommandsHelp());
}
else if (helpParts.Count == 1 && helpParts[0] == "categories")
{ {
help.Add(""); // Will become a newline. help.Add(""); // Will become a newline.
help.Add(GeneralHelpText); help.Add(GeneralHelpText);
help.Add(ItemHelpText); help.Add(ItemHelpText);
help.AddRange(CollectModulesHelp(tree)); help.AddRange(CollectModulesHelp(tree));
} }
else if (helpParts.Count == 1 && helpParts[0] == "all")
{
help.AddRange(CollectAllCommandsHelp());
}
else else
{ {
help.AddRange(CollectHelp(helpParts)); help.AddRange(CollectHelp(helpParts));