From dc84f350a763b3c5ba5a5b8ad173fde3867f24f4 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 14 Mar 2008 16:28:33 +0000 Subject: * As yet incomplete fix for mantis #766 - terse updates broken * Currently, terse updates are back, and extremely rapid linking and delinking will only break occasionally * More work to do here --- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs') diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index e295f87..4c69930 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -947,6 +947,9 @@ namespace OpenSim.Region.Environment.Scenes /// The group of prims which should be linked to this group public void LinkToGroup(SceneObjectGroup objectGroup) { + if (objectGroup.RootPart.UpdateFlag > 0) + return; + SceneObjectPart linkPart = objectGroup.m_rootPart; Vector3 oldGroupPosition = @@ -1014,10 +1017,13 @@ namespace OpenSim.Region.Environment.Scenes /// public void DelinkFromGroup(uint partID) { + if (RootPart.UpdateFlag > 0) + return; + SceneObjectPart linkPart = GetChildPart(partID); if (null != linkPart) - { + { LLQuaternion worldRot = linkPart.GetWorldRotation(); // Remove the part from this object -- cgit v1.1