diff options
| author | Justin Clark-Casey (justincc) | 2013-06-28 19:19:38 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-28 19:19:38 +0100 |
| commit | e26e8b882965430f66c6459987a8b219d68e5da1 (patch) | |
| tree | c16ff0a11f61b6d3593501bdb6862731d8374885 | |
| parent | In XAssetService, on a delete asset request also delete the asset in any chai... (diff) | |
| download | opensim-SC_OLD-e26e8b882965430f66c6459987a8b219d68e5da1.zip opensim-SC_OLD-e26e8b882965430f66c6459987a8b219d68e5da1.tar.gz opensim-SC_OLD-e26e8b882965430f66c6459987a8b219d68e5da1.tar.bz2 opensim-SC_OLD-e26e8b882965430f66c6459987a8b219d68e5da1.tar.xz | |
Remove "Asset deletion not supported by database" message from "delete asset" robust/standalone console command since it actually was implemented and performed.
Improve other associated messages.
| -rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index ff45d94..cc4325a 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | |||
| @@ -119,16 +119,14 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 119 | 119 | ||
| 120 | if (asset == null || asset.Data.Length == 0) | 120 | if (asset == null || asset.Data.Length == 0) |
| 121 | { | 121 | { |
| 122 | MainConsole.Instance.Output("Asset not found"); | 122 | MainConsole.Instance.OutputFormat("Could not find asset with ID {0}", args[2]); |
| 123 | return; | 123 | return; |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | m_AssetService.Delete(args[2]); | 126 | if (!m_AssetService.Delete(asset.ID)) |
| 127 | 127 | MainConsole.Instance.OutputFormat("ERROR: Could not delete asset {0} {1}", asset.ID, asset.Name); | |
| 128 | //MainConsole.Instance.Output("Asset deleted"); | 128 | else |
| 129 | // TODO: Implement this | 129 | MainConsole.Instance.OutputFormat("Deleted asset {0} {1}", asset.ID, asset.Name); |
| 130 | |||
| 131 | MainConsole.Instance.Output("Asset deletion not supported by database"); | ||
| 132 | } | 130 | } |
| 133 | 131 | ||
| 134 | void HandleDumpAsset(string module, string[] args) | 132 | void HandleDumpAsset(string module, string[] args) |