When linking two groups, and then deleting the combined group: delete *all* of the combined group's prims, including those that came from the second subgroup

This fixes http://opensimulator.org/mantis/view.php?id=6175
This commit is contained in:
Oren Hurvitz
2013-10-24 11:18:15 +03:00
parent b0cb0ec02f
commit 62b3bdf0fc
3 changed files with 41 additions and 17 deletions

View File

@@ -143,7 +143,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(grp1.Parts.Length, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
Assert.That(part2.AbsolutePosition == Vector3.Zero, "The absolute position should be zero");
Assert.That(grp3.HasGroupChangedDueToDelink, Is.True);
Assert.That(grp3.GroupContainsForeignPrims, Is.True);
}
[Test]
@@ -349,10 +349,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// These changes should occur immediately without waiting for a backup pass
SceneObjectGroup groupToDelete = sog.DelinkFromGroup(linkPart, false);
Assert.That(groupToDelete.HasGroupChangedDueToDelink, Is.True);
Assert.That(groupToDelete.GroupContainsForeignPrims, Is.True);
scene.DeleteSceneObject(groupToDelete, false);
Assert.That(groupToDelete.HasGroupChangedDueToDelink, Is.False);
Assert.That(groupToDelete.GroupContainsForeignPrims, Is.False);
List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);