From 691c4bc756b9565e648ff8ad88cfbfabd1b0be76 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 22 Nov 2008 00:23:48 +0000
Subject: Mantis #2442 Attempt to reinstate the Object Entry flag in parcel
 settings

---
 OpenSim/Region/Environment/Scenes/SceneGraph.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneGraph.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
index 4c15da2..f1ef6c3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
@@ -1185,7 +1185,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 else
                 {
-                    if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) || group.IsAttachment)
+                    if ((m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos)) || group.IsAttachment)
                     {
                         group.UpdateGroupPosition(pos);
                     }
-- 
cgit v1.1