Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge

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 @@
 
 using System.Text;
 using OpenMetaverse;
+using OpenMetaverse.Assets;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
@@ -130,7 +131,11 @@ namespace OpenSim.Tests.Common
         /// </summary>
         public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string data, UUID creatorID)
         {
-            return CreateAsset(assetUuid, assetType, Encoding.ASCII.GetBytes(data), creatorID);
+            AssetNotecard anc = new AssetNotecard();
+            anc.BodyText = "data";
+            anc.Encode();
+
+            return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID);
         }
         
         /// <summary>