Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."

This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.

3 files changed, 6 insertions, 86 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 640a024..cc42f7f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -169,11 +169,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             return newLand;
         }
 
-        public ILandObject MemberwiseCopy()
-        {
-            return (ILandObject)this.MemberwiseClone();
-        }
-
         static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount;
         static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount;
 
@@ -247,13 +242,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_lastSeqId = seq_id;
             }
 
-            ILandObject landToSend = this;
-            m_scene.Permissions.LandObjectForClient(remote_client.AgentId, (ILandObject)this, out landToSend);
             remote_client.SendLandProperties(seq_id,
-                        snap_selection, request_result, landToSend,
-                        (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
-                        GetParcelMaxPrimCount(),
-                        GetSimulatorMaxPrimCount(), regionFlags);
+                    snap_selection, request_result, this,
+                    (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
+                    GetParcelMaxPrimCount(),
+                    GetSimulatorMaxPrimCount(), regionFlags);
         }
 
         public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client)
@@ -482,32 +475,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             return false;
         }
 
-        public bool IsAllowedInLand(UUID avatar)
-        {
-            ExpireAccessList();
-
-            if (m_scene.Permissions.IsAdministrator(avatar))
-                return true;
-
-            if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
-                return true;
-
-            if (avatar == LandData.OwnerID)
-                return true;
-
-            if (LandData.ParcelAccessList.FindIndex(
-                        delegate(LandAccessEntry e)
-                        {
-                            if (e.AgentID == avatar && e.Flags == AccessList.Access)
-                                return true;
-                            return false;
-                        }) != -1)
-                {
-                    return true;
-                }
-            return false;
-        }
-
         public void SendLandUpdateToClient(IClientAPI remote_client)
         {
             SendLandProperties(0, false, 0, remote_client);
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index f536a0f..6018c39 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -94,9 +94,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         private bool m_RegionOwnerIsGod = false;
         private bool m_RegionManagerIsGod = false;
         private bool m_ParcelOwnerIsGod = false;
-
-        private bool m_SimpleBuildPermissions = false;
-
+        
         /// <value>
         /// The set of users that are allowed to create scripts.  This is only active if permissions are not being
         /// bypassed.  This overrides normal permissions.
@@ -141,9 +139,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
             m_RegionManagerIsGod = myConfig.GetBoolean("region_manager_is_god", false);
             m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true);
-
-            m_SimpleBuildPermissions = myConfig.GetBoolean("simple_build_permissions", false);
-
+            
             m_allowedScriptCreators 
                 = ParseUserSetConfigSetting(myConfig, "allowed_script_creators", m_allowedScriptCreators);
             m_allowedScriptEditors
@@ -210,9 +206,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnControlPrimMedia += CanControlPrimMedia;
             m_scene.Permissions.OnInteractWithPrimMedia += CanInteractWithPrimMedia;
 
-            if (m_SimpleBuildPermissions)
-                m_scene.Permissions.OnSendLandProperties += GenerateLandProperties;
-
             m_scene.AddCommand("Users", this, "bypass permissions",
                     "bypass permissions <true / false>",
                     "Bypass permission checks",
@@ -831,10 +824,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 permission = true;
             }
 
-            if (m_SimpleBuildPermissions &&
-                (parcel.LandData.Flags & (uint)ParcelFlags.UseAccessList) == 0 && parcel.IsAllowedInLand(user))
-                permission = true;
-
             return permission;
         }
     
@@ -1977,24 +1966,5 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             
             return false;
         }
-
-        private void GenerateLandProperties(UUID userID, ILandObject realLand, out ILandObject landToSend)
-        {
-            landToSend = realLand;
-            if (m_bypassPermissions) return;
-
-            if (m_SimpleBuildPermissions &&
-                !m_scene.Permissions.IsAdministrator(userID) &&
-                !realLand.LandData.OwnerID.Equals(userID) &&
-                ((realLand.LandData.Flags & (uint)ParcelFlags.UseAccessList) == 0 && realLand.IsAllowedInLand(userID)))
-            {
-                ILandObject clone = realLand.MemberwiseCopy();
-                LandData ldata = realLand.LandData.Copy();
-                clone.LandData = ldata;
-                clone.LandData.Flags |= (uint)(ParcelFlags.AllowAPrimitiveEntry | ParcelFlags.AllowFly | ParcelFlags.AllowOtherScripts | ParcelFlags.CreateObjects);
-                landToSend = clone;
-            }
-        }
-
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index a4605c4..e1fedf4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -90,7 +90,6 @@ namespace OpenSim.Region.Framework.Scenes
     public delegate bool TeleportHandler(UUID userID, Scene scene);
     public delegate bool ControlPrimMediaHandler(UUID userID, UUID primID, int face);
     public delegate bool InteractWithPrimMediaHandler(UUID userID, UUID primID, int face);
-    public delegate void SendLandPropertiesHandler(UUID userID, ILandObject realLand, out ILandObject landToSend);
     #endregion
 
     public class ScenePermissions
@@ -158,7 +157,6 @@ namespace OpenSim.Region.Framework.Scenes
         public event TeleportHandler OnTeleport;
         public event ControlPrimMediaHandler OnControlPrimMedia;
         public event InteractWithPrimMediaHandler OnInteractWithPrimMedia;
-        public event SendLandPropertiesHandler OnSendLandProperties;
         #endregion
 
         #region Object Permission Checks
@@ -1100,20 +1098,5 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
-
-        public void LandObjectForClient(UUID userID, ILandObject realLand, out ILandObject landToSend)
-        {
-            landToSend = realLand;
-            SendLandPropertiesHandler handler = OnSendLandProperties;
-            if (handler != null)
-            {
-                Delegate[] list = handler.GetInvocationList();
-                foreach (SendLandPropertiesHandler h in list)
-                {
-                    h(userID, realLand, out landToSend);
-                }
-            }
-        }
-
     }
 }