2 files changed, 47 insertions, 10 deletions

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 239afc0..3a2e420 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -564,7 +564,7 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name="scene"></param>
         /// <returns></returns>
-        public static SceneObjectPart AddSceneObject(Scene scene)
+        public static SceneObjectGroup AddSceneObject(Scene scene)
         {
             return AddSceneObject(scene, "Test Object", UUID.Zero);
         }
@@ -576,16 +576,16 @@ namespace OpenSim.Tests.Common
         /// <param name="name"></param>
         /// <param name="ownerId"></param>
         /// <returns></returns>
-        public static SceneObjectPart AddSceneObject(Scene scene, string name, UUID ownerId)
+        public static SceneObjectGroup AddSceneObject(Scene scene, string name, UUID ownerId)
         {
-            SceneObjectPart part = CreateSceneObjectPart(name, UUID.Random(), ownerId);
+            SceneObjectGroup so = new SceneObjectGroup(CreateSceneObjectPart(name, UUID.Random(), ownerId));
 
             //part.UpdatePrimFlags(false, false, true);
             //part.ObjectFlags |= (uint)PrimFlags.Phantom;
 
-            scene.AddNewSceneObject(new SceneObjectGroup(part), false);
+            scene.AddNewSceneObject(so, false);
 
-            return part;
+            return so;
         }
         
         /// <summary>
diff --git a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
index 7058d1e..9607f1f 100644
--- a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
@@ -45,20 +45,23 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name="scene"></param>
         /// <param name="part"></param>
+        /// <param name="itemName"></param>
+        /// <param name="itemID"></param>
+        /// <param name="assetID"></param>
         /// <returns>The item that was added</returns>
-        public static TaskInventoryItem AddNotecard(Scene scene, SceneObjectPart part)
+        public static TaskInventoryItem AddNotecard(Scene scene, SceneObjectPart part, string itemName, UUID itemID, UUID assetID)
         {
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
-            UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
-            UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
+
             AssetBase ncAsset
-                = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
+                = AssetHelpers.CreateAsset(assetID, AssetType.Notecard, nc.AssetData, UUID.Zero);
             scene.AssetService.Store(ncAsset);
+
             TaskInventoryItem ncItem 
                 = new TaskInventoryItem 
-                    { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid, 
+                    { Name = itemName, AssetID = assetID, ItemID = itemID,
                       Type = (int)AssetType.Notecard, InvType = (int)InventoryType.Notecard };
             part.Inventory.AddInventoryItem(ncItem, true); 
             
@@ -66,8 +69,42 @@ namespace OpenSim.Tests.Common
         }
 
         /// <summary>
+        /// Add a blank script to the given part.
+        /// </summary>
+        /// <remarks>
+        /// TODO: Accept input for item and asset IDs to avoid mysterious script failures that try to use any of these
+        /// functions more than once in a test.
+        /// </remarks>
+        /// <param name="scene"></param>
+        /// <param name="part"></param>
+        /// <returns>The item that was added</returns>
+        public static TaskInventoryItem AddScript(Scene scene, SceneObjectPart part)
+        {
+            AssetScriptText ast = new AssetScriptText();
+            ast.Encode();
+
+            UUID assetUuid = new UUID("00000000-0000-0000-1000-000000000000");
+            UUID itemUuid = new UUID("00000000-0000-0000-1100-000000000000");
+            AssetBase asset
+                = AssetHelpers.CreateAsset(assetUuid, AssetType.LSLText, ast.AssetData, UUID.Zero);
+            scene.AssetService.Store(asset);
+            TaskInventoryItem item
+                = new TaskInventoryItem 
+                    { Name = "scriptItem", AssetID = assetUuid, ItemID = itemUuid,
+                      Type = (int)AssetType.LSLText, InvType = (int)InventoryType.LSL };
+            part.Inventory.AddInventoryItem(item, true);
+            
+            return item;
+        }
+
+        /// <summary>
         /// Add a scene object item to the given part.
         /// </summary>
+        /// <remarks>
+        /// TODO: Accept input for item and asset IDs to avoid mysterious script failures that try to use any of these
+        /// functions more than once in a test.
+        /// </remarks>
+        ///
         /// <param name="scene"></param>
         /// <param name="sop"></param>
         /// <param name="itemName"></param>