aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-22 00:21:45 +0100
committerJustin Clark-Casey (justincc)2011-10-22 00:21:45 +0100
commit5d7eaedbebd408d948321dc474927fc72d3d98c5 (patch)
tree382c8084d7c1080b24beb0bc9a1a2e99a3bf848a
parentrefactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss... (diff)
downloadopensim-SC-5d7eaedbebd408d948321dc474927fc72d3d98c5.zip
opensim-SC-5d7eaedbebd408d948321dc474927fc72d3d98c5.tar.gz
opensim-SC-5d7eaedbebd408d948321dc474927fc72d3d98c5.tar.bz2
opensim-SC-5d7eaedbebd408d948321dc474927fc72d3d98c5.tar.xz
encode notecard assets in proper format for tests, rather than just using whatever string is given
Diffstat (limited to '')
-rw-r--r--OpenSim/Tests/Common/Helpers/AssetHelpers.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index 4839bcb..aecd77e 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -27,6 +27,7 @@
27 27
28using System.Text; 28using System.Text;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenMetaverse.Assets;
30using OpenSim.Framework; 31using OpenSim.Framework;
31using OpenSim.Region.Framework.Scenes; 32using OpenSim.Region.Framework.Scenes;
32using OpenSim.Region.Framework.Scenes.Serialization; 33using OpenSim.Region.Framework.Scenes.Serialization;
@@ -130,7 +131,11 @@ namespace OpenSim.Tests.Common
130 /// </summary> 131 /// </summary>
131 public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string data, UUID creatorID) 132 public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string data, UUID creatorID)
132 { 133 {
133 return CreateAsset(assetUuid, assetType, Encoding.ASCII.GetBytes(data), creatorID); 134 AssetNotecard anc = new AssetNotecard();
135 anc.BodyText = "data";
136 anc.Encode();
137
138 return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID);
134 } 139 }
135 140
136 /// <summary> 141 /// <summary>