aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-14 16:28:33 +0000
committerJustin Clarke Casey2008-03-14 16:28:33 +0000
commitdc84f350a763b3c5ba5a5b8ad173fde3867f24f4 (patch)
tree1953d18633bf3a3edc46fb6914914c555958217e /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parent* You can leave godmode if you want now. (diff)
downloadopensim-SC_OLD-dc84f350a763b3c5ba5a5b8ad173fde3867f24f4.zip
opensim-SC_OLD-dc84f350a763b3c5ba5a5b8ad173fde3867f24f4.tar.gz
opensim-SC_OLD-dc84f350a763b3c5ba5a5b8ad173fde3867f24f4.tar.bz2
opensim-SC_OLD-dc84f350a763b3c5ba5a5b8ad173fde3867f24f4.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs8
1 files changed, 7 insertions, 1 deletions
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
947 /// <param name="objectGroup">The group of prims which should be linked to this group</param> 947 /// <param name="objectGroup">The group of prims which should be linked to this group</param>
948 public void LinkToGroup(SceneObjectGroup objectGroup) 948 public void LinkToGroup(SceneObjectGroup objectGroup)
949 { 949 {
950 if (objectGroup.RootPart.UpdateFlag > 0)
951 return;
952
950 SceneObjectPart linkPart = objectGroup.m_rootPart; 953 SceneObjectPart linkPart = objectGroup.m_rootPart;
951 954
952 Vector3 oldGroupPosition = 955 Vector3 oldGroupPosition =
@@ -1014,10 +1017,13 @@ namespace OpenSim.Region.Environment.Scenes
1014 /// <param name="partID"></param> 1017 /// <param name="partID"></param>
1015 public void DelinkFromGroup(uint partID) 1018 public void DelinkFromGroup(uint partID)
1016 { 1019 {
1020 if (RootPart.UpdateFlag > 0)
1021 return;
1022
1017 SceneObjectPart linkPart = GetChildPart(partID); 1023 SceneObjectPart linkPart = GetChildPart(partID);
1018 1024
1019 if (null != linkPart) 1025 if (null != linkPart)
1020 { 1026 {
1021 LLQuaternion worldRot = linkPart.GetWorldRotation(); 1027 LLQuaternion worldRot = linkPart.GetWorldRotation();
1022 1028
1023 // Remove the part from this object 1029 // Remove the part from this object