From 30320505fa54640baf4ecaff8bb743f62ef01f86 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 22 Oct 2011 00:58:56 +0100
Subject: redirect UserInventoryHelpers to use a different
CreateNotecardAsset() so we can comment out some inconsistency
---
OpenSim/Tests/Common/Helpers/AssetHelpers.cs | 22 +++++++++++-----------
.../Tests/Common/Helpers/UserInventoryHelpers.cs | 9 ++++++++-
2 files changed, 19 insertions(+), 12 deletions(-)
(limited to 'OpenSim')
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
return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random());
}
- /// <summary>
- /// Create and store a notecard asset with a random uuid and dummy text.
- /// </summary>
- /// <param name="creatorId">/param>
- /// <returns></returns>
- public static AssetBase CreateNotecardAsset(Scene scene, UUID creatorId)
- {
- AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId);
- scene.AssetService.Store(asset);
- return asset;
- }
+// /// <summary>
+// /// Create and store a notecard asset with a random uuid and dummy text.
+// /// </summary>
+// /// <param name="creatorId">/param>
+// /// <returns></returns>
+// public static AssetBase CreateNotecardAsset(Scene scene, UUID creatorId)
+// {
+// AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId);
+// scene.AssetService.Store(asset);
+// return asset;
+// }
/// <summary>
/// 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
AssetBase asset = null;
if (type == InventoryType.Notecard)
- asset = AssetHelpers.CreateNotecardAsset(scene, userId);
+ {
+ asset = AssetHelpers.CreateNotecardAsset();
+ asset.CreatorID = userId.ToString();
+ }
else if (type == InventoryType.Object)
+ {
asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
+ }
else
+ {
throw new Exception(string.Format("Inventory type {0} not supported", type));
+ }
scene.AssetService.Store(asset);
--
cgit v1.1