diff options
| author | Dan Lake | 2012-03-02 09:19:35 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-03-02 09:19:35 -0800 |
| commit | 64a036b4cf6954f5d001ad04bb8f6d63c28c07a4 (patch) | |
| tree | 88394d77c1f6cc996b99e23ba5ac05ca1f04357a /OpenSim/Region/Framework | |
| parent | ScenePresence line endings and fix AllowMovement default to true. (diff) | |
| parent | minor: remove mono compiler warning (diff) | |
| download | opensim-SC_OLD-64a036b4cf6954f5d001ad04bb8f6d63c28c07a4.zip opensim-SC_OLD-64a036b4cf6954f5d001ad04bb8f6d63c28c07a4.tar.gz opensim-SC_OLD-64a036b4cf6954f5d001ad04bb8f6d63c28c07a4.tar.bz2 opensim-SC_OLD-64a036b4cf6954f5d001ad04bb8f6d63c28c07a4.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs index e4b607d..e16903c 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | |||
| @@ -65,8 +65,7 @@ namespace OpenSim.Region.Framework.Tests | |||
| 65 | 65 | ||
| 66 | // Create an object embedded inside the first | 66 | // Create an object embedded inside the first |
| 67 | UUID taskSceneObjectItemId = UUID.Parse("00000000-0000-0000-0000-100000000000"); | 67 | UUID taskSceneObjectItemId = UUID.Parse("00000000-0000-0000-0000-100000000000"); |
| 68 | TaskInventoryItem taskSceneObjectItem | 68 | TaskInventoryHelpers.AddSceneObject(scene, sop1, "tso", taskSceneObjectItemId, user1.PrincipalID); |
| 69 | = TaskInventoryHelpers.AddSceneObject(scene, sop1, "tso", taskSceneObjectItemId, user1.PrincipalID); | ||
| 70 | 69 | ||
| 71 | TaskInventoryItem addedItem = sop1.Inventory.GetInventoryItem(taskSceneObjectItemId); | 70 | TaskInventoryItem addedItem = sop1.Inventory.GetInventoryItem(taskSceneObjectItemId); |
| 72 | Assert.That(addedItem.ItemID, Is.EqualTo(taskSceneObjectItemId)); | 71 | Assert.That(addedItem.ItemID, Is.EqualTo(taskSceneObjectItemId)); |