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

have no entry set, part 1
This commit is contained in:
Melanie Thielker
2008-11-22 15:58:52 +00:00
parent 25d6b18bcd
commit e982a24f77

View File

@@ -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);
}