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

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 9378e20..fa8277c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -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);