Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 9b80245..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);
 
@@ -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",