aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-22 13:27:17 -0800
committerJohn Hurliman2010-02-22 13:27:17 -0800
commit7665aad002ef066fc31fa9497225d2668641c769 (patch)
treece2ad89f1ffd20c6f5e9a3b6558f7b90c651c830 /OpenSim/Tests
parent* Added a sanity check for missing asset data in LLClientView (diff)
downloadopensim-SC-7665aad002ef066fc31fa9497225d2668641c769.zip
opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.gz
opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.bz2
opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.xz
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Common/Setup/AssetHelpers.cs9
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index 1188b62..98de514 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -38,12 +38,9 @@ namespace OpenSim.Tests.Common
38 /// <summary> 38 /// <summary>
39 /// Create an asset from the given data 39 /// Create an asset from the given data
40 /// </summary> 40 /// </summary>
41 /// <param name="assetUuid"></param> 41 public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID)
42 /// <param name="data"></param>
43 /// <returns></returns>
44 public static AssetBase CreateAsset(UUID assetUuid, string data)
45 { 42 {
46 AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object); 43 AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID);
47 asset.Data = Encoding.ASCII.GetBytes(data); 44 asset.Data = Encoding.ASCII.GetBytes(data);
48 return asset; 45 return asset;
49 } 46 }
@@ -56,7 +53,7 @@ namespace OpenSim.Tests.Common
56 /// <returns></returns> 53 /// <returns></returns>
57 public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) 54 public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog)
58 { 55 {
59 AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object); 56 AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, sog.OwnerID);
60 asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)); 57 asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog));
61 return asset; 58 return asset;
62 } 59 }