change CanObjectEntry() to use a SOG

2 files changed, 19 insertions, 21 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 6dc982b..92485a1 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -2620,7 +2620,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 // FIXME: It would be better to never add the scene object at all rather than add it and then delete
                 // it
-                if (!Scene.Permissions.CanObjectEntry(so.UUID, true, so.AbsolutePosition))
+                if (!Scene.Permissions.CanObjectEntry(so, true, so.AbsolutePosition))
                 {
                     // Deny non attachments based on parcel settings
                     //
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 79308b4..95a007a 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1437,42 +1437,40 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return true;
         }
 
-        private bool CanObjectEntry(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene)
+        private bool CanObjectEntry(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint, Scene scene)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
-            if (m_bypassPermissions) return m_bypassPermissionsValue;
-
-            // allow outide region this mb needed for crossings ???
-            if (newPoint.X < -1f || newPoint.Y < -1f)
-                return true;
-            if (newPoint.X > scene.RegionInfo.RegionSizeX + 1.0f ||  newPoint.Y > scene.RegionInfo.RegionSizeY + 1.0f)
-                return true;
 
-            ILandObject parcel = m_scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
-            if (parcel == null)
+            if(sog == null || sog.IsDeleted)
                 return false;
 
-            if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowAPrimitiveEntry)) != 0)
+            float newX = newPoint.X;
+            float newY = newPoint.Y;
+
+            // allow outside region this mb needed for crossings
+            if (newX < -1f || newX > (scene.RegionInfo.RegionSizeX + 1.0f) ||
+                newY < -1f || newY > (scene.RegionInfo.RegionSizeY + 1.0f) )
                 return true;
 
-            EntityBase ent = null;
-            if (!m_scene.Entities.TryGetValue(objectID, out ent))
-                return false;
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
 
-            if(ent == null || !(ent is SceneObjectGroup))
+            ILandObject parcel = scene.LandChannel.GetLandObject(newX, newY);
+            if (parcel == null)
                 return false;
 
-            SceneObjectGroup task = (SceneObjectGroup)ent;
+            if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowAPrimitiveEntry)) != 0)
+                return true;
 
             if (!enteringRegion)
             {
-                ILandObject fromparcel = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
-
-                if (fromparcel == parcel) // it already entered parcel ????
+                Vector3 oldPoint = sog.AbsolutePosition;
+                ILandObject fromparcel = m_scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
+                if (fromparcel != null && fromparcel.Equals(parcel)) // it already entered parcel ????
                     return true;
             }
 
-            if (GenericParcelPermission(task.OwnerID, parcel, 0))
+            if (GenericParcelPermission(sog.OwnerID, parcel, 0))
                 return true;
 
             //Otherwise, false!