diff options
author | Justin Clark-Casey (justincc) | 2011-10-22 00:58:56 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-22 00:58:56 +0100 |
commit | 30320505fa54640baf4ecaff8bb743f62ef01f86 (patch) | |
tree | 5721e027a330b55d23d6f4a04c85242460c4b7f1 /OpenSim/Tests/Common | |
parent | correct misleading method doc on CreateNotecardAsset() (diff) | |
download | opensim-SC_OLD-30320505fa54640baf4ecaff8bb743f62ef01f86.zip opensim-SC_OLD-30320505fa54640baf4ecaff8bb743f62ef01f86.tar.gz opensim-SC_OLD-30320505fa54640baf4ecaff8bb743f62ef01f86.tar.bz2 opensim-SC_OLD-30320505fa54640baf4ecaff8bb743f62ef01f86.tar.xz |
redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we can comment out some inconsistency
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/AssetHelpers.cs | 22 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 9 |
2 files changed, 19 insertions, 12 deletions
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs index f5db0f7..efeb973 100644 --- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs | |||
@@ -56,17 +56,17 @@ namespace OpenSim.Tests.Common | |||
56 | return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random()); | 56 | return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random()); |
57 | } | 57 | } |
58 | 58 | ||
59 | /// <summary> | 59 | // /// <summary> |
60 | /// Create and store a notecard asset with a random uuid and dummy text. | 60 | // /// Create and store a notecard asset with a random uuid and dummy text. |
61 | /// </summary> | 61 | // /// </summary> |
62 | /// <param name="creatorId">/param> | 62 | // /// <param name="creatorId">/param> |
63 | /// <returns></returns> | 63 | // /// <returns></returns> |
64 | public static AssetBase CreateNotecardAsset(Scene scene, UUID creatorId) | 64 | // public static AssetBase CreateNotecardAsset(Scene scene, UUID creatorId) |
65 | { | 65 | // { |
66 | AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); | 66 | // AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); |
67 | scene.AssetService.Store(asset); | 67 | // scene.AssetService.Store(asset); |
68 | return asset; | 68 | // return asset; |
69 | } | 69 | // } |
70 | 70 | ||
71 | /// <summary> | 71 | /// <summary> |
72 | /// Create an asset from the given object. | 72 | /// Create an asset from the given object. |
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index 0de38c2..fdc60d8 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |||
@@ -86,11 +86,18 @@ namespace OpenSim.Tests.Common | |||
86 | AssetBase asset = null; | 86 | AssetBase asset = null; |
87 | 87 | ||
88 | if (type == InventoryType.Notecard) | 88 | if (type == InventoryType.Notecard) |
89 | asset = AssetHelpers.CreateNotecardAsset(scene, userId); | 89 | { |
90 | asset = AssetHelpers.CreateNotecardAsset(); | ||
91 | asset.CreatorID = userId.ToString(); | ||
92 | } | ||
90 | else if (type == InventoryType.Object) | 93 | else if (type == InventoryType.Object) |
94 | { | ||
91 | asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId)); | 95 | asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId)); |
96 | } | ||
92 | else | 97 | else |
98 | { | ||
93 | throw new Exception(string.Format("Inventory type {0} not supported", type)); | 99 | throw new Exception(string.Format("Inventory type {0} not supported", type)); |
100 | } | ||
94 | 101 | ||
95 | scene.AssetService.Store(asset); | 102 | scene.AssetService.Store(asset); |
96 | 103 | ||