aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-05-21 19:36:39 +0100
committerJustin Clark-Casey (justincc)2010-05-21 19:36:39 +0100
commit74ef1ed36f234d93aa3d58b1602344bcb3e00d6e (patch)
tree4d2cea7595c5ae54fc8eff50f541b4716660c256 /OpenSim/Tests/Common
parentOnly send dialogs and notices to root agents, not child agents (diff)
downloadopensim-SC-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.zip
opensim-SC-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.gz
opensim-SC-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.bz2
opensim-SC-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.xz
add prim item and test asset save in save oar unit test
Diffstat (limited to '')
-rw-r--r--OpenSim/Tests/Common/Setup/AssetHelpers.cs14
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index 1fc3cb5..1beafcf 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -38,12 +38,20 @@ 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 public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID) 41 public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, byte[] data, UUID creatorID)
42 { 42 {
43 AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID.ToString()); 43 AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)assetType, creatorID.ToString());
44 asset.Data = Encoding.ASCII.GetBytes(data); 44 asset.Data = data;
45 return asset; 45 return asset;
46 } 46 }
47
48 /// <summary>
49 /// Create an asset from the given data
50 /// </summary>
51 public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string data, UUID creatorID)
52 {
53 return CreateAsset(assetUuid, assetType, Encoding.ASCII.GetBytes(data), creatorID);
54 }
47 55
48 /// <summary> 56 /// <summary>
49 /// Create an asset from the given scene object 57 /// Create an asset from the given scene object