aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2012-07-11 03:58:58 +0100
committerUbitUmarov2012-07-11 03:58:58 +0100
commit7836933133a27bb57cd89663134f37b78fed5f7c (patch)
tree40209c754ad70f3de2497431e9ec9615be97294a /OpenSim/Region/Framework
parent clear released minheap items so they don't keep holding references to (diff)
downloadopensim-SC_OLD-7836933133a27bb57cd89663134f37b78fed5f7c.zip
opensim-SC_OLD-7836933133a27bb57cd89663134f37b78fed5f7c.tar.gz
opensim-SC_OLD-7836933133a27bb57cd89663134f37b78fed5f7c.tar.bz2
opensim-SC_OLD-7836933133a27bb57cd89663134f37b78fed5f7c.tar.xz
Melanie fix: detach SOGs from backup on linking
Diffstat (limited to 'OpenSim/Region/Framework')
-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 a600b86..0587846 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1820,6 +1820,8 @@ namespace OpenSim.Region.Framework.Scenes
1820 { 1820 {
1821 parentGroup.LinkToGroup(child); 1821 parentGroup.LinkToGroup(child);
1822 1822
1823 child.DetachFromBackup();
1824
1823 // this is here so physics gets updated! 1825 // this is here so physics gets updated!
1824 // Don't remove! Bad juju! Stay away! or fix physics! 1826 // Don't remove! Bad juju! Stay away! or fix physics!
1825 child.AbsolutePosition = child.AbsolutePosition; 1827 child.AbsolutePosition = child.AbsolutePosition;