From 749c3fef8ad2d3af97fcd9ab9c72740675e46715 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 8 Mar 2012 01:51:37 +0000
Subject: 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.
---
 OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Server/Handlers/Asset')

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
             server.AddStreamHandler(new AssetServerPostHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete));
 
-            MainConsole.Instance.Commands.AddCommand("kfs", false,
+            MainConsole.Instance.Commands.AddCommand("Assets", false,
                     "show asset",
                     "show asset <ID>",
                     "Show asset information",
                     HandleShowAsset);
 
-            MainConsole.Instance.Commands.AddCommand("kfs", false,
+            MainConsole.Instance.Commands.AddCommand("Assets", false,
                     "delete asset",
                     "delete asset <ID>",
                     "Delete asset from database",
                     HandleDeleteAsset);
 
-            MainConsole.Instance.Commands.AddCommand("kfs", false,
+            MainConsole.Instance.Commands.AddCommand("Assets", false,
                     "dump asset",
                     "dump asset <ID>",
                     "Dump asset to a file",
-- 
cgit v1.1


From 8131a24cde3f3877b3b8dd850871c57c17b2b216 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 27 Mar 2012 10:08:13 -0700
Subject: Send the config section name up to the service classes themselves
 (XInventory and Assets).

---
 OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Server/Handlers/Asset')

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 8b9e749..46b0c67 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Server.Handlers.Asset
             if (assetService == String.Empty)
                 throw new Exception("No LocalServiceModule in config file");
 
-            Object[] args = new Object[] { config };
+            Object[] args = new Object[] { config, m_ConfigName };
             m_AssetService =
                     ServerUtils.LoadPlugin<IAssetService>(assetService, args);
 
-- 
cgit v1.1