From 893915ce0b88348bc7e2053e8942f76ad7ef830b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 4 Nov 2010 21:09:59 +0100
Subject: Fix child prims returning after being unlinked and deleted where the
 root is not deleted

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b016065..a462133 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1760,6 +1760,11 @@ namespace OpenSim.Region.Framework.Scenes
                 //
                 foreach (SceneObjectGroup g in affectedGroups)
                 {
+                    // Child prims that have been unlinked and deleted will
+                    // return unless the root is deleted. This will remove them
+                    // from the database. They will be rewritten immediately,
+                    // minus the rows for the unlinked child prims.
+                    m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
                     g.TriggerScriptChangedEvent(Changed.LINK);
                     g.HasGroupChanged = true; // Persist
                     g.areUpdatesSuspended = false;
-- 
cgit v1.1