diff options
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
-rw-r--r-- | OpenSim/Tests/Common/Setup/AssetHelpers.cs | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs index af66d7f..971c6bc 100644 --- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Tests.Common | |||
55 | AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); | 55 | AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); |
56 | scene.AssetService.Store(asset); | 56 | scene.AssetService.Store(asset); |
57 | return asset; | 57 | return asset; |
58 | } | 58 | } |
59 | 59 | ||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Create an asset from the given scene object. | 61 | /// Create an asset from the given scene object. |
@@ -75,6 +75,20 @@ namespace OpenSim.Tests.Common | |||
75 | /// <summary> | 75 | /// <summary> |
76 | /// Create an asset from the given scene object. | 76 | /// Create an asset from the given scene object. |
77 | /// </summary> | 77 | /// </summary> |
78 | /// <param name="assetUuidTailZ"> | ||
79 | /// The hexadecimal last part of the UUID for the asset created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}" | ||
80 | /// will be used. | ||
81 | /// </param> | ||
82 | /// <param name="coa"></param> | ||
83 | /// <returns></returns> | ||
84 | public static AssetBase CreateAsset(int assetUuidTail, CoalescedSceneObjects coa) | ||
85 | { | ||
86 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), coa); | ||
87 | } | ||
88 | |||
89 | /// <summary> | ||
90 | /// Create an asset from the given scene object. | ||
91 | /// </summary> | ||
78 | /// <param name="assetUuid"></param> | 92 | /// <param name="assetUuid"></param> |
79 | /// <param name="coa"></param> | 93 | /// <param name="coa"></param> |
80 | /// <returns></returns> | 94 | /// <returns></returns> |
@@ -85,7 +99,7 @@ namespace OpenSim.Tests.Common | |||
85 | AssetType.Object, | 99 | AssetType.Object, |
86 | Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), | 100 | Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), |
87 | coa.CreatorId); | 101 | coa.CreatorId); |
88 | } | 102 | } |
89 | 103 | ||
90 | /// <summary> | 104 | /// <summary> |
91 | /// Create an asset from the given data. | 105 | /// Create an asset from the given data. |