aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-05-21 00:39:42 +0100
committerJustin Clark-Casey (justincc)2011-05-21 00:39:42 +0100
commitd7e5b76d73fe3e6d3a7d5506989bd2c081ab4fc6 (patch)
tree541210732cb1fb1d1cab8f5fc6f8f7c7ba5b9f54
parentrefactor: move scene object item creation code into TaskInventoryHelpers (diff)
downloadopensim-SC_OLD-d7e5b76d73fe3e6d3a7d5506989bd2c081ab4fc6.zip
opensim-SC_OLD-d7e5b76d73fe3e6d3a7d5506989bd2c081ab4fc6.tar.gz
opensim-SC_OLD-d7e5b76d73fe3e6d3a7d5506989bd2c081ab4fc6.tar.bz2
opensim-SC_OLD-d7e5b76d73fe3e6d3a7d5506989bd2c081ab4fc6.tar.xz
refactor: rename AddSceneObjectItem to AddSceneObject
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs2
-rw-r--r--OpenSim/Tests/Common/Setup/TaskInventoryHelpers.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 32bb068..74eab63 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Framework.Tests
67 // Create an object embedded inside the first 67 // Create an object embedded inside the first
68 UUID taskSceneObjectItemId = UUID.Parse("00000000-0000-0000-0000-100000000000"); 68 UUID taskSceneObjectItemId = UUID.Parse("00000000-0000-0000-0000-100000000000");
69 TaskInventoryItem taskSceneObjectItem 69 TaskInventoryItem taskSceneObjectItem
70 = TaskInventoryHelpers.AddSceneObjectItem(scene, sop1, "tso", taskSceneObjectItemId); 70 = TaskInventoryHelpers.AddSceneObject(scene, sop1, "tso", taskSceneObjectItemId);
71 71
72 scene.AddSceneObject(sog1); 72 scene.AddSceneObject(sog1);
73 73
diff --git a/OpenSim/Tests/Common/Setup/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Setup/TaskInventoryHelpers.cs
index 4467573..fbf00d6 100644
--- a/OpenSim/Tests/Common/Setup/TaskInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/TaskInventoryHelpers.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Tests.Common.Setup
72 /// <param name="sop"></param> 72 /// <param name="sop"></param>
73 /// <param name="itemName"></param> 73 /// <param name="itemName"></param>
74 /// <param name="id"></param> 74 /// <param name="id"></param>
75 public static TaskInventoryItem AddSceneObjectItem(Scene scene, SceneObjectPart sop, string itemName, UUID id) 75 public static TaskInventoryItem AddSceneObject(Scene scene, SceneObjectPart sop, string itemName, UUID id)
76 { 76 {
77 SceneObjectGroup taskSceneObject = SceneSetupHelpers.CreateSceneObject(1, UUID.Zero); 77 SceneObjectGroup taskSceneObject = SceneSetupHelpers.CreateSceneObject(1, UUID.Zero);
78 AssetBase taskSceneObjectAsset = AssetHelpers.CreateAsset(0x10, taskSceneObject); 78 AssetBase taskSceneObjectAsset = AssetHelpers.CreateAsset(0x10, taskSceneObject);