diff options
| author | John Hurliman | 2010-02-22 14:18:59 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 14:18:59 -0800 |
| commit | df76e95aa2dc9f3f3a0c546761b7624adc183ed0 (patch) | |
| tree | 74e7cc684b12ca9b67e01e62bfcf481c1da98eb2 /OpenSim/Tests | |
| parent | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... (diff) | |
| download | opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.zip opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.gz opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.bz2 opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.xz | |
Changed asset CreatorID to a string
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/AssetHelpers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs index 98de514..1fc3cb5 100644 --- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs | |||
| @@ -40,7 +40,7 @@ namespace OpenSim.Tests.Common | |||
| 40 | /// </summary> | 40 | /// </summary> |
| 41 | public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID) | 41 | public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID) |
| 42 | { | 42 | { |
| 43 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID); | 43 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID.ToString()); |
| 44 | asset.Data = Encoding.ASCII.GetBytes(data); | 44 | asset.Data = Encoding.ASCII.GetBytes(data); |
| 45 | return asset; | 45 | return asset; |
| 46 | } | 46 | } |
| @@ -53,7 +53,7 @@ namespace OpenSim.Tests.Common | |||
| 53 | /// <returns></returns> | 53 | /// <returns></returns> |
| 54 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) | 54 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) |
| 55 | { | 55 | { |
| 56 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, sog.OwnerID); | 56 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, sog.OwnerID.ToString()); |
| 57 | asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)); | 57 | asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)); |
| 58 | return asset; | 58 | return asset; |
| 59 | } | 59 | } |