ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-10-25 03:18:38 +01:00
parent 56f3da7b5a 5d7eaedbeb
commit da805d0cce
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Tests/Common/Helpers/AssetHelpers.cs
View File

@@ -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>