Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge
commit
be2cfeb5c3
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue