From 195893b06dc3fe539fa68ccbd1953a061953ba44 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 6 Oct 2008 05:23:48 +0000 Subject: [PATCH] Remove an unnecessary perms check. This caused prim movement to be disabled on parcels that had prim entry turned off. This needs to be reintroduced with proper parcel boundary checks. --- OpenSim/Region/Environment/Scenes/InnerScene.cs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index fdde801473..4840133d87 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -1137,13 +1137,6 @@ namespace OpenSim.Region.Environment.Scenes SceneObjectGroup group = GetGroupByPrim(localID); if (group != null) { - // Vector3 oldPos = group.AbsolutePosition; - if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment) - { - group.SendGroupTerseUpdate(); - return; - } - if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment) { group.UpdateSinglePosition(pos, localID); @@ -1170,13 +1163,7 @@ namespace OpenSim.Region.Environment.Scenes } else { - if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment) - { - group.SendGroupTerseUpdate(); - - return; - } - if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment) + if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment) { group.UpdateGroupPosition(pos); }