aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-07-23 19:53:26 +0100
committerMelanie2012-07-23 19:53:26 +0100
commitfc77bca936e7d28b4e92a73289124b41cd50b553 (patch)
tree94a996fa4206da5e00426cc072c55b421cdedc03
parentCommitting Avination's memleak fix-a-thon, installment #2 (diff)
downloadopensim-SC_OLD-fc77bca936e7d28b4e92a73289124b41cd50b553.zip
opensim-SC_OLD-fc77bca936e7d28b4e92a73289124b41cd50b553.tar.gz
opensim-SC_OLD-fc77bca936e7d28b4e92a73289124b41cd50b553.tar.bz2
opensim-SC_OLD-fc77bca936e7d28b4e92a73289124b41cd50b553.tar.xz
Committing Avination's memleak fix-a-thon, installment #3
When linking, detach the no longer used SOG's from backup so they can be collected. Since their Children collection is never emptied, they prevent their former SOPs from being collected as well.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index ba68dfa..13842ad 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1638,6 +1638,8 @@ namespace OpenSim.Region.Framework.Scenes
1638 { 1638 {
1639 parentGroup.LinkToGroup(child); 1639 parentGroup.LinkToGroup(child);
1640 1640
1641 child.DetachFromBackup();
1642
1641 // this is here so physics gets updated! 1643 // this is here so physics gets updated!
1642 // Don't remove! Bad juju! Stay away! or fix physics! 1644 // Don't remove! Bad juju! Stay away! or fix physics!
1643 child.AbsolutePosition = child.AbsolutePosition; 1645 child.AbsolutePosition = child.AbsolutePosition;