diff options
author | Justin Clark-Casey (justincc) | 2011-05-20 23:22:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-20 23:22:27 +0100 |
commit | 7ed419217fc63f7a01c13a7c3320e97edd6bb1b6 (patch) | |
tree | 103b12378cd343109eeb4a9e933def63dff77168 /OpenSim/Tests | |
parent | Implement llGetLinKNumberOfSides(). (diff) | |
download | opensim-SC_OLD-7ed419217fc63f7a01c13a7c3320e97edd6bb1b6.zip opensim-SC_OLD-7ed419217fc63f7a01c13a7c3320e97edd6bb1b6.tar.gz opensim-SC_OLD-7ed419217fc63f7a01c13a7c3320e97edd6bb1b6.tar.bz2 opensim-SC_OLD-7ed419217fc63f7a01c13a7c3320e97edd6bb1b6.tar.xz |
add test for rezzing an object from a prim item
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Setup/AssetHelpers.cs | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs index d572249..aa55bcd 100644 --- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs | |||
@@ -56,10 +56,24 @@ namespace OpenSim.Tests.Common | |||
56 | AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); | 56 | AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); |
57 | scene.AssetService.Store(asset); | 57 | scene.AssetService.Store(asset); |
58 | return asset; | 58 | return asset; |
59 | } | 59 | } |
60 | |||
61 | /// <summary> | ||
62 | /// Create an asset from the given object. | ||
63 | /// </summary> | ||
64 | /// <param name="assetUuidTail"> | ||
65 | /// The hexadecimal last part of the UUID for the asset created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}" | ||
66 | /// will be used. | ||
67 | /// </param> | ||
68 | /// <param name="sog"></param> | ||
69 | /// <returns></returns> | ||
70 | public static AssetBase CreateAsset(int assetUuidTail, SceneObjectGroup sog) | ||
71 | { | ||
72 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), sog); | ||
73 | } | ||
60 | 74 | ||
61 | /// <summary> | 75 | /// <summary> |
62 | /// Create an asset from the given scene object. | 76 | /// Create an asset from the given object. |
63 | /// </summary> | 77 | /// </summary> |
64 | /// <param name="assetUuid"></param> | 78 | /// <param name="assetUuid"></param> |
65 | /// <param name="sog"></param> | 79 | /// <param name="sog"></param> |
@@ -76,7 +90,7 @@ namespace OpenSim.Tests.Common | |||
76 | /// <summary> | 90 | /// <summary> |
77 | /// Create an asset from the given scene object. | 91 | /// Create an asset from the given scene object. |
78 | /// </summary> | 92 | /// </summary> |
79 | /// <param name="assetUuidTailZ"> | 93 | /// <param name="assetUuidTail"> |
80 | /// The hexadecimal last part of the UUID for the asset created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}" | 94 | /// The hexadecimal last part of the UUID for the asset created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}" |
81 | /// will be used. | 95 | /// will be used. |
82 | /// </param> | 96 | /// </param> |