change console main help to match master
parent
8fde2fb901
commit
759789bc45
|
@ -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 ' to get a list of all commands,
|
= @"For more information, type 'help all' 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>
|
||||||
|
@ -115,16 +115,14 @@ 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(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));
|
||||||
|
@ -147,11 +145,8 @@ namespace OpenSim.Framework.Console
|
||||||
{
|
{
|
||||||
foreach (List<CommandInfo> commands in m_modulesCommands.Values)
|
foreach (List<CommandInfo> commands in m_modulesCommands.Values)
|
||||||
{
|
{
|
||||||
foreach (CommandInfo c in commands)
|
var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help));
|
||||||
{
|
help.AddRange(ourHelpText);
|
||||||
if (c.long_help != String.Empty)
|
|
||||||
help.Add(string.Format("{0} - {1}", c.help_text, c.long_help));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue