From 0fd17c08ae642fac17b24dfad06c61cfe5739483 Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 20 Aug 2019 23:28:59 +0100 Subject: Massive console refactor. Greatly simplify interface. --- .../Region/OptionalModules/Asset/AssetInfoModule.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) mode change 100644 => 100755 OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs (limited to 'OpenSim/Region/OptionalModules/Asset') diff --git a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs old mode 100644 new mode 100755 index 906e1ee..89c6637 --- a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs @@ -115,14 +115,14 @@ namespace OpenSim.Region.OptionalModules.Asset if (!UUID.TryParse(rawAssetId, out assetId)) { - MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId); + MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", null, rawAssetId); return; } AssetBase asset = m_scene.AssetService.Get(assetId.ToString()); if (asset == null) { - MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId); + MainConsole.Instance.Output("ERROR: No asset found with ID {0}", null, assetId); return; } @@ -139,7 +139,7 @@ namespace OpenSim.Region.OptionalModules.Asset } } - MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName); + MainConsole.Instance.Output("Asset dumped to file {0}", null, fileName); } void HandleShowAsset(string module, string[] args) @@ -160,13 +160,13 @@ namespace OpenSim.Region.OptionalModules.Asset int i; - MainConsole.Instance.OutputFormat("Name: {0}", asset.Name); - MainConsole.Instance.OutputFormat("Description: {0}", asset.Description); - MainConsole.Instance.OutputFormat("Type: {0} (type number = {1})", (AssetType)asset.Type, asset.Type); - MainConsole.Instance.OutputFormat("Content-type: {0}", asset.Metadata.ContentType); - MainConsole.Instance.OutputFormat("Size: {0} bytes", asset.Data.Length); - MainConsole.Instance.OutputFormat("Temporary: {0}", asset.Temporary ? "yes" : "no"); - MainConsole.Instance.OutputFormat("Flags: {0}", asset.Metadata.Flags); + MainConsole.Instance.Output("Name: {0}", null, asset.Name); + MainConsole.Instance.Output("Description: {0}", null, asset.Description); + MainConsole.Instance.Output("Type: {0} (type number = {1})", null, (AssetType)asset.Type, asset.Type); + MainConsole.Instance.Output("Content-type: {0}", null, asset.Metadata.ContentType); + MainConsole.Instance.Output("Size: {0} bytes", null, asset.Data.Length); + MainConsole.Instance.Output("Temporary: {0}", null, asset.Temporary ? "yes" : "no"); + MainConsole.Instance.Output("Flags: {0}", null, asset.Metadata.Flags); for (i = 0 ; i < 5 ; i++) { -- cgit v1.1