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/Scene.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 723f874..2fcca43 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2157,12 +2157,14 @@ namespace OpenSim.Region.Environment.Scenes
             if (XMLMethod == 0)
             {
                 SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData);
+
                 AddRestoredSceneObject(sceneObject, true, false);
 
                 SceneObjectPart RootPrim = GetSceneObjectPart(primID);
                 if (RootPrim != null)
                 {
-                    if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID))
+                    if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID) ||
+                        Permissions.CanObjectEntry(RootPrim.UUID, true, RootPrim.AbsolutePosition))
                     {
                         SceneObjectGroup grp = RootPrim.ParentGroup;
                         if (grp != null)
-- 
cgit v1.1