aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2019-03-05 17:03:17 +0000
committerUbitUmarov2019-03-05 17:03:17 +0000
commit39f73b82d4d0a5a43443c8275c8fe94297c51410 (patch)
treef47aa0140d0ce3467190a48f1ddfd39f2d64c7a2
parentllupd direct encode object updates for agents; let terse updates be zeroencod... (diff)
downloadopensim-SC-39f73b82d4d0a5a43443c8275c8fe94297c51410.zip
opensim-SC-39f73b82d4d0a5a43443c8275c8fe94297c51410.tar.gz
opensim-SC-39f73b82d4d0a5a43443c8275c8fe94297c51410.tar.bz2
opensim-SC-39f73b82d4d0a5a43443c8275c8fe94297c51410.tar.xz
dont try to backup a object in the middle of possible multipack link
-rwxr-xr-xOpenSim/Region/Framework/Scenes/SceneGraph.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b526fe9..ea037be 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1913,9 +1913,8 @@ namespace OpenSim.Region.Framework.Scenes
1913 { 1913 {
1914 if (parentGroup.OwnerID == child.OwnerID) 1914 if (parentGroup.OwnerID == child.OwnerID)
1915 { 1915 {
1916 parentGroup.LinkToGroup(child);
1917
1918 child.DetachFromBackup(); 1916 child.DetachFromBackup();
1917 parentGroup.LinkToGroup(child);
1919 1918
1920 // this is here so physics gets updated! 1919 // this is here so physics gets updated!
1921 // Don't remove! Bad juju! Stay away! or fix physics! 1920 // Don't remove! Bad juju! Stay away! or fix physics!
@@ -1943,7 +1942,6 @@ namespace OpenSim.Region.Framework.Scenes
1943*/ 1942*/
1944 parentGroup.AdjustChildPrimPermissions(false); 1943 parentGroup.AdjustChildPrimPermissions(false);
1945 parentGroup.HasGroupChanged = true; 1944 parentGroup.HasGroupChanged = true;
1946 parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
1947 parentGroup.ScheduleGroupForFullAnimUpdate(); 1945 parentGroup.ScheduleGroupForFullAnimUpdate();
1948 Monitor.Exit(m_linkLock); 1946 Monitor.Exit(m_linkLock);
1949 } 1947 }