aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs9
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
28using System; 28using System;
29using System.Collections.Generic;
29using System.Reflection; 30using System.Reflection;
30using Nini.Config; 31using Nini.Config;
31using NUnit.Framework; 32using 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);