From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- OpenSim/Tests/Common/Helpers/AssetHelpers.cs | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'OpenSim/Tests/Common/Helpers/AssetHelpers.cs') diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs index 7af8bed..974da4c 100644 --- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs @@ -66,7 +66,7 @@ namespace OpenSim.Tests.Common { return CreateAsset(assetId, AssetType.Notecard, text, UUID.Random()); } - + // /// // /// Create and store a notecard asset with a random uuid and dummy text. // /// @@ -92,7 +92,7 @@ namespace OpenSim.Tests.Common { return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), sog); } - + /// /// Create an asset from the given object. /// @@ -102,12 +102,12 @@ namespace OpenSim.Tests.Common public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) { return CreateAsset( - assetUuid, - AssetType.Object, - Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), + assetUuid, + AssetType.Object, + Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), sog.OwnerID); } - + /// /// Create an asset from the given scene object. /// @@ -120,8 +120,8 @@ namespace OpenSim.Tests.Common public static AssetBase CreateAsset(int assetUuidTail, CoalescedSceneObjects coa) { return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), coa); - } - + } + /// /// Create an asset from the given scene object. /// @@ -131,12 +131,12 @@ namespace OpenSim.Tests.Common public static AssetBase CreateAsset(UUID assetUuid, CoalescedSceneObjects coa) { return CreateAsset( - assetUuid, - AssetType.Object, - Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), + assetUuid, + AssetType.Object, + Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), coa.CreatorId); - } - + } + /// /// Create an asset from the given data. /// @@ -148,7 +148,7 @@ namespace OpenSim.Tests.Common return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID); } - + /// /// Create an asset from the given data. /// @@ -158,9 +158,9 @@ namespace OpenSim.Tests.Common asset.Data = data; return asset; } - + public static string ReadAssetAsString(IAssetService assetService, UUID uuid) - { + { byte[] assetData = assetService.GetData(uuid.ToString()); return Encoding.ASCII.GetString(assetData); } -- cgit v1.1