aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-11-04 21:09:59 +0100
committerMelanie2010-11-04 21:09:59 +0100
commit893915ce0b88348bc7e2053e8942f76ad7ef830b (patch)
tree84629d3cb7903a8174bed214437cec219e531d50 /OpenSim/Region/Framework
parentFix avatar to avatar inventory gives across servers (diff)
downloadopensim-SC_OLD-893915ce0b88348bc7e2053e8942f76ad7ef830b.zip
opensim-SC_OLD-893915ce0b88348bc7e2053e8942f76ad7ef830b.tar.gz
opensim-SC_OLD-893915ce0b88348bc7e2053e8942f76ad7ef830b.tar.bz2
opensim-SC_OLD-893915ce0b88348bc7e2053e8942f76ad7ef830b.tar.xz
Fix child prims returning after being unlinked and deleted where the root is
not deleted
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs5
1 files changed, 5 insertions, 0 deletions
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
1760 // 1760 //
1761 foreach (SceneObjectGroup g in affectedGroups) 1761 foreach (SceneObjectGroup g in affectedGroups)
1762 { 1762 {
1763 // Child prims that have been unlinked and deleted will
1764 // return unless the root is deleted. This will remove them
1765 // from the database. They will be rewritten immediately,
1766 // minus the rows for the unlinked child prims.
1767 m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
1763 g.TriggerScriptChangedEvent(Changed.LINK); 1768 g.TriggerScriptChangedEvent(Changed.LINK);
1764 g.HasGroupChanged = true; // Persist 1769 g.HasGroupChanged = true; // Persist
1765 g.areUpdatesSuspended = false; 1770 g.areUpdatesSuspended = false;