diff options
| author | Melanie | 2012-03-08 19:10:22 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-08 19:10:22 +0000 |
| commit | b0fc96c17d818ab7a57d7d84e26ca8138b3985a4 (patch) | |
| tree | a50cda2fed5359b83e63ed3df41bdc3a8b7198d7 /OpenSim/Server/Handlers | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Move "change region" command into general category (diff) | |
| download | opensim-SC-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.zip opensim-SC-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.gz opensim-SC-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.bz2 opensim-SC-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server/Handlers')
| -rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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", |