Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge

avinationmerge
Melanie 2011-10-25 03:18:49 +01:00
commit be2cfeb5c3
1 changed files with 2 additions and 2 deletions

View File

@ -129,10 +129,10 @@ namespace OpenSim.Tests.Common
/// <summary> /// <summary>
/// Create an asset from the given data. /// Create an asset from the given data.
/// </summary> /// </summary>
public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string data, UUID creatorID) public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string text, UUID creatorID)
{ {
AssetNotecard anc = new AssetNotecard(); AssetNotecard anc = new AssetNotecard();
anc.BodyText = "data"; anc.BodyText = text;
anc.Encode(); anc.Encode();
return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID); return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID);