From 2e7b72d3dad42288237f85d02a9769ce31109309 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 23 Nov 2012 02:04:24 +0000
Subject: 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.

---
 OpenSim/Framework/Console/CommandConsole.cs | 11 ++++++-----
 1 file 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
             = "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
-= @"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:";
 
         /// <value>
@@ -113,15 +113,16 @@ namespace OpenSim.Framework.Console
             // General help
             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(ItemHelpText);
                 help.AddRange(CollectModulesHelp(tree));
             }
-            else if (helpParts.Count == 1 && helpParts[0] == "all")
-            {
-                help.AddRange(CollectAllCommandsHelp());
-            }
             else
             {
                 help.AddRange(CollectHelp(helpParts));
-- 
cgit v1.1