diff options
author | Justin Clark-Casey (justincc) | 2012-03-08 01:51:37 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-08 01:51:37 +0000 |
commit | 749c3fef8ad2d3af97fcd9ab9c72740675e46715 (patch) | |
tree | 068e6adc89dc50386413d85064e80e3114e3fd49 /OpenSim/Server | |
parent | minor: make NPC tests run in a given order, comment out log lines in mock reg... (diff) | |
download | opensim-SC_OLD-749c3fef8ad2d3af97fcd9ab9c72740675e46715.zip opensim-SC_OLD-749c3fef8ad2d3af97fcd9ab9c72740675e46715.tar.gz opensim-SC_OLD-749c3fef8ad2d3af97fcd9ab9c72740675e46715.tar.bz2 opensim-SC_OLD-749c3fef8ad2d3af97fcd9ab9c72740675e46715.tar.xz |
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 8 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index a6f4e47..36c48e6 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -236,16 +236,16 @@ namespace OpenSim.Server.Base | |||
236 | 236 | ||
237 | // Register the quit command | 237 | // Register the quit command |
238 | // | 238 | // |
239 | MainConsole.Instance.Commands.AddCommand("base", false, "quit", | 239 | MainConsole.Instance.Commands.AddCommand("General", false, "quit", |
240 | "quit", | 240 | "quit", |
241 | "Quit the application", HandleQuit); | 241 | "Quit the application", HandleQuit); |
242 | 242 | ||
243 | MainConsole.Instance.Commands.AddCommand("base", false, "shutdown", | 243 | MainConsole.Instance.Commands.AddCommand("General", false, "shutdown", |
244 | "shutdown", | 244 | "shutdown", |
245 | "Quit the application", HandleQuit); | 245 | "Quit the application", HandleQuit); |
246 | 246 | ||
247 | // Register a command to read other commands from a file | 247 | // Register a command to read other commands from a file |
248 | MainConsole.Instance.Commands.AddCommand("base", false, "command-script", | 248 | MainConsole.Instance.Commands.AddCommand("General", false, "command-script", |
249 | "command-script <script>", | 249 | "command-script <script>", |
250 | "Run a command script from file", HandleScript); | 250 | "Run a command script from file", HandleScript); |
251 | 251 | ||
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index 9b80245..8b9e749 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | |||
@@ -72,19 +72,19 @@ namespace OpenSim.Server.Handlers.Asset | |||
72 | server.AddStreamHandler(new AssetServerPostHandler(m_AssetService)); | 72 | server.AddStreamHandler(new AssetServerPostHandler(m_AssetService)); |
73 | server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete)); | 73 | server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete)); |
74 | 74 | ||
75 | MainConsole.Instance.Commands.AddCommand("kfs", false, | 75 | MainConsole.Instance.Commands.AddCommand("Assets", false, |
76 | "show asset", | 76 | "show asset", |
77 | "show asset <ID>", | 77 | "show asset <ID>", |
78 | "Show asset information", | 78 | "Show asset information", |
79 | HandleShowAsset); | 79 | HandleShowAsset); |
80 | 80 | ||
81 | MainConsole.Instance.Commands.AddCommand("kfs", false, | 81 | MainConsole.Instance.Commands.AddCommand("Assets", false, |
82 | "delete asset", | 82 | "delete asset", |
83 | "delete asset <ID>", | 83 | "delete asset <ID>", |
84 | "Delete asset from database", | 84 | "Delete asset from database", |
85 | HandleDeleteAsset); | 85 | HandleDeleteAsset); |
86 | 86 | ||
87 | MainConsole.Instance.Commands.AddCommand("kfs", false, | 87 | MainConsole.Instance.Commands.AddCommand("Assets", false, |
88 | "dump asset", | 88 | "dump asset", |
89 | "dump asset <ID>", | 89 | "dump asset <ID>", |
90 | "Dump asset to a file", | 90 | "Dump asset to a file", |