Merge branch 'master' into careminster-presence-refactor

2 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 2a6d362..04b20d4 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool IsBannedFromLand(UUID avatar)
         {
-            if (m_scene.Permissions.IsAdministrator(avatar))
+            if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0))
                 return false;
 
             if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             if (e.AgentID == avatar && e.Flags == AccessList.Ban)
                                 return true;
                             return false;
-                        }) != -1 && LandData.OwnerID != avatar)
+                        }) != -1)
                 {
                     return true;
                 }
@@ -473,7 +473,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool IsRestrictedFromLand(UUID avatar)
         {
-            if (m_scene.Permissions.IsAdministrator(avatar))
+            if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0))
                 return false;
 
             if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
@@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             if (e.AgentID == avatar && e.Flags == AccessList.Access)
                                 return true;
                             return false;
-                        }) == -1 && LandData.OwnerID != avatar)
+                        }) == -1)
                 {
                     if (!HasGroupAccess(avatar))
                     {
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 43b37c7..2c7843f 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 return;
 
             m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false);
-            m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", false);
+            m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
             m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true);
             m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
             m_RegionManagerIsGod = myConfig.GetBoolean("region_manager_is_god", false);