diff options
| author | Justin Clark-Casey (justincc) | 2010-11-22 23:07:30 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-11-22 23:07:30 +0000 |
| commit | bbc291dfdf9b96d0bdf89d365d0cfd8405ae52e1 (patch) | |
| tree | 8b2519f657b61021665f4da64f1e254e2b6e0037 /OpenSim | |
| parent | add basic tests to check that under default permissions module owner can dele... (diff) | |
| download | opensim-SC-bbc291dfdf9b96d0bdf89d365d0cfd8405ae52e1.zip opensim-SC-bbc291dfdf9b96d0bdf89d365d0cfd8405ae52e1.tar.gz opensim-SC-bbc291dfdf9b96d0bdf89d365d0cfd8405ae52e1.tar.bz2 opensim-SC-bbc291dfdf9b96d0bdf89d365d0cfd8405ae52e1.tar.xz | |
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs index 7851f72..b3b99f4 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | using System; | 28 | using System; |
| 29 | using System.Collections.Generic; | ||
| 29 | using System.Reflection; | 30 | using System.Reflection; |
| 30 | using Nini.Config; | 31 | using Nini.Config; |
| 31 | using NUnit.Framework; | 32 | using NUnit.Framework; |
| @@ -76,8 +77,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 76 | = new SceneObjectPart(userId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); | 77 | = new SceneObjectPart(userId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); |
| 77 | part.Name = "obj1"; | 78 | part.Name = "obj1"; |
| 78 | scene.AddNewSceneObject(new SceneObjectGroup(part), false); | 79 | scene.AddNewSceneObject(new SceneObjectGroup(part), false); |
| 80 | List<uint> localIds = new List<uint>(); | ||
| 81 | localIds.Add(part.LocalId); | ||
| 79 | 82 | ||
| 80 | scene.DeRezObject(client, part.LocalId, UUID.Zero, DeRezAction.Delete, UUID.Zero); | 83 | scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero); |
| 81 | sogd.InventoryDeQueueAndDelete(); | 84 | sogd.InventoryDeQueueAndDelete(); |
| 82 | 85 | ||
| 83 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 86 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
| @@ -113,8 +116,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 113 | = new SceneObjectPart(objectOwnerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); | 116 | = new SceneObjectPart(objectOwnerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); |
| 114 | part.Name = "obj1"; | 117 | part.Name = "obj1"; |
| 115 | scene.AddNewSceneObject(new SceneObjectGroup(part), false); | 118 | scene.AddNewSceneObject(new SceneObjectGroup(part), false); |
| 119 | List<uint> localIds = new List<uint>(); | ||
| 120 | localIds.Add(part.LocalId); | ||
| 116 | 121 | ||
| 117 | scene.DeRezObject(client, part.LocalId, UUID.Zero, DeRezAction.Delete, UUID.Zero); | 122 | scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero); |
| 118 | sogd.InventoryDeQueueAndDelete(); | 123 | sogd.InventoryDeQueueAndDelete(); |
| 119 | 124 | ||
| 120 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 125 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |