From e982a24f77e79129e8830dddb47fd045e1409ffc Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 22 Nov 2008 15:58:52 +0000 Subject: [PATCH] Remove a redundant check and add checking for attachments in parcels that have no entry set, part 1 --- OpenSim/Region/Environment/Scenes/SceneGraph.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs index f1ef6c31a0..c25ce3c1d1 100644 --- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs @@ -1179,13 +1179,13 @@ namespace OpenSim.Region.Environment.Scenes { // Vector3 oldPos = group.AbsolutePosition; - if (group.IsAttachment) + if (group.IsAttachment || (group.RootPrim.Shape.PCode == 9 && group.RootPrim.Shape.State != 0)) { group.UpdateGroupPosition(pos); } else { - if ((m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos)) || group.IsAttachment) + if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos)) { group.UpdateGroupPosition(pos); }