aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-11-23 02:04:24 +0000
committerMelanie2012-11-23 02:04:24 +0000
commit2e7b72d3dad42288237f85d02a9769ce31109309 (patch)
tree54c82fb3212eb3fe3191ff17f7ea731b0edf596e
parentFix a build break introduced by us having a more efficient DoubleDictionary (diff)
downloadopensim-SC_OLD-2e7b72d3dad42288237f85d02a9769ce31109309.zip
opensim-SC_OLD-2e7b72d3dad42288237f85d02a9769ce31109309.tar.gz
opensim-SC_OLD-2e7b72d3dad42288237f85d02a9769ce31109309.tar.bz2
opensim-SC_OLD-2e7b72d3dad42288237f85d02a9769ce31109309.tar.xz
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.
-rw-r--r--OpenSim/Framework/Console/CommandConsole.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index de30414..f160404 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -83,7 +83,7 @@ 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 all' to get a list of all commands, 86= @"For more information, type 'help' 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>
@@ -113,15 +113,16 @@ namespace OpenSim.Framework.Console
113 // General help 113 // General help
114 if (helpParts.Count == 0) 114 if (helpParts.Count == 0)
115 { 115 {
116 help.Add(GeneralHelpText);
117 help.AddRange(CollectAllCommandsHelp());
118 }
119 else if (helpParts.Count == 1 && helpParts[0] == "categories")
120 {
116 help.Add(""); // Will become a newline. 121 help.Add(""); // Will become a newline.
117 help.Add(GeneralHelpText); 122 help.Add(GeneralHelpText);
118 help.Add(ItemHelpText); 123 help.Add(ItemHelpText);
119 help.AddRange(CollectModulesHelp(tree)); 124 help.AddRange(CollectModulesHelp(tree));
120 } 125 }
121 else if (helpParts.Count == 1 && helpParts[0] == "all")
122 {
123 help.AddRange(CollectAllCommandsHelp());
124 }
125 else 126 else
126 { 127 {
127 help.AddRange(CollectHelp(helpParts)); 128 help.AddRange(CollectHelp(helpParts));