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.

1 files changed, 2 insertions, 32 deletions

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;
-            }
-        }
-
     }
 }