From 6de7da467a508a28cd11c13ed1ad2e8400520b21 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 10 Dec 2015 17:04:39 +0000 Subject: keep SOG reference to root part since two many things depend on deleted SOGs not being deleted --- .../Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs') diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index 098f1b4..ac8c32d 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs @@ -171,11 +171,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests // Test that we don't get back an object for a local id that doesn't exist Assert.That(scene.GetGroupByPrim(999), Is.Null); + uint soid = so.LocalId; + uint spid = parts[partsToTestCount - 1].LocalId; + // Now delete the scene object and check again scene.DeleteSceneObject(so, false); - Assert.That(scene.GetGroupByPrim(so.LocalId), Is.Null); - Assert.That(scene.GetGroupByPrim(parts[partsToTestCount - 1].LocalId), Is.Null); + Assert.That(scene.GetGroupByPrim(soid), Is.Null); + Assert.That(scene.GetGroupByPrim(spid), Is.Null); } /// @@ -194,12 +197,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests SceneObjectGroup so = SceneHelpers.AddSceneObject(scene); Assert.That(so.IsDeleted, Is.False); + uint retrievedPartID = so.LocalId; scene.DeleteSceneObject(so, false); - Assert.That(so.IsDeleted, Is.True); + SceneObjectPart retrievedPart = scene.GetSceneObjectPart(retrievedPartID); - SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId); Assert.That(retrievedPart, Is.Null); } -- cgit v1.1