Remove a redundant check and add checking for attachments in parcels that

have no entry set, part 1

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
index f1ef6c3..c25ce3c 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);
                     }