aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-12 18:59:50 +0000
committerJustin Clarke Casey2008-03-12 18:59:50 +0000
commitbbb9a21eb5f5705215fe76b697bdcf1469dd3067 (patch)
treefbe9128f71b2cbc4c41b28313ac28ae861619906 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parent* Don't abort (and keep failing) the update if one Entity gives us an excepti... (diff)
downloadopensim-SC_OLD-bbb9a21eb5f5705215fe76b697bdcf1469dd3067.zip
opensim-SC_OLD-bbb9a21eb5f5705215fe76b697bdcf1469dd3067.tar.gz
opensim-SC_OLD-bbb9a21eb5f5705215fe76b697bdcf1469dd3067.tar.bz2
opensim-SC_OLD-bbb9a21eb5f5705215fe76b697bdcf1469dd3067.tar.xz
* Fix mantis 757.
* DelinkFromGroup was removing the parts from the delinked group, which later upset the update thread when it tried to do a queued update for that object * Temporary fix is to stop deleting the parts, though it would be good later to stop sending out the now spurious updates * This fix actually reveals another bug, where rapid linking and delinking will cause the non root prims to disappear (though they're actually still there if you relog). This is the next bug to tackle.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index b7b4f70..1a32460 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -935,8 +935,10 @@ namespace OpenSim.Region.Environment.Scenes
935 935
936 m_scene.DeleteEntity(objectGroup.UUID); 936 m_scene.DeleteEntity(objectGroup.UUID);
937 937
938 objectGroup.DeleteParts(); 938 // TODO justincc Left here as a remind to myself to see if we can stop sending out
939 AbsolutePosition = AbsolutePosition; 939 // useless updates for this group once it has been deleted.
940 //objectGroup.DeleteParts();
941
940 ScheduleGroupForFullUpdate(); 942 ScheduleGroupForFullUpdate();
941 } 943 }
942 944
@@ -1021,9 +1023,9 @@ namespace OpenSim.Region.Environment.Scenes
1021 } 1023 }
1022 else 1024 else
1023 { 1025 {
1024 m_log.InfoFormat("[SCENE]: " + 1026 m_log.InfoFormat("[SCENE OBJECT GROUP]: " +
1025 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}", 1027 "DelinkFromGroup(): Child prim {0} not found in object {1}, {2}",
1026 partID, LocalId); 1028 partID, LocalId, UUID);
1027 } 1029 }
1028 } 1030 }
1029 1031