Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge

1 files changed, 8 insertions, 1 deletions

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);