diff options
| author | Melanie | 2011-10-25 03:18:49 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:18:49 +0100 |
| commit | be2cfeb5c3bf6087526b617faaa655af3c3f93c3 (patch) | |
| tree | 974e5efc81a3733894ef6792e223e6f1185b1975 /OpenSim | |
| parent | Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge (diff) | |
| parent | in AssetHelpers, store the actual text passed in to the method, not the strin... (diff) | |
| download | opensim-SC-be2cfeb5c3bf6087526b617faaa655af3c3f93c3.zip opensim-SC-be2cfeb5c3bf6087526b617faaa655af3c3f93c3.tar.gz opensim-SC-be2cfeb5c3bf6087526b617faaa655af3c3f93c3.tar.bz2 opensim-SC-be2cfeb5c3bf6087526b617faaa655af3c3f93c3.tar.xz | |
Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/AssetHelpers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs index aecd77e..94d3629 100644 --- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs | |||
| @@ -129,10 +129,10 @@ namespace OpenSim.Tests.Common | |||
| 129 | /// <summary> | 129 | /// <summary> |
| 130 | /// Create an asset from the given data. | 130 | /// Create an asset from the given data. |
| 131 | /// </summary> | 131 | /// </summary> |
| 132 | public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string data, UUID creatorID) | 132 | public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string text, UUID creatorID) |
| 133 | { | 133 | { |
| 134 | AssetNotecard anc = new AssetNotecard(); | 134 | AssetNotecard anc = new AssetNotecard(); |
| 135 | anc.BodyText = "data"; | 135 | anc.BodyText = text; |
| 136 | anc.Encode(); | 136 | anc.Encode(); |
| 137 | 137 | ||
| 138 | return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID); | 138 | return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID); |