Refactor: Scene.ExternalChecks -> Scene.Permissions. Also make all

the internals of the permissions module adapter sane

2 files changed, 10 insertions, 10 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 99128bc..fe2458c 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -729,7 +729,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
 
             //If we are still here, then they are subdividing within one piece of land
             //Check owner
-            if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(attempting_user_id, startLandObject))
+            if (!m_scene.Permissions.CanEditParcel(attempting_user_id, startLandObject))
             {
                 return;
             }
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
             {
                 return;
             }
-            if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(attempting_user_id, masterLandObject))
+            if (!m_scene.Permissions.CanEditParcel(attempting_user_id, masterLandObject))
             {
                 return;
             }
@@ -1009,7 +1009,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
 
             if (land != null)
             {
-                if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remote_client.AgentId))
+                if (m_scene.Permissions.IsGod(remote_client.AgentId))
                 {
                     land.landData.OwnerID = ownerID;
 
@@ -1029,7 +1029,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
 
             if (land != null)
             {
-                if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, land))
+                if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land))
                 {
                     if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
                         land.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -1051,7 +1051,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
 
             if (land != null)
             {
-                if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, land))
+                if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land))
                 {
                     if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
                         land.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -1321,7 +1321,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
 
             if (land == null) return;
 
-            if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(remoteClient.AgentId, land))
+            if (!m_scene.Permissions.CanEditParcel(remoteClient.AgentId, land))
                 return;
 
             land.landData.OtherCleanTime = otherCleanTime;
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 1483118..89256fa 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -181,14 +181,14 @@ namespace OpenSim.Region.Environment.Modules.World.Land
 
         public void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client)
         {
-            if (m_scene.ExternalChecks.ExternalChecksCanEditParcel(remote_client.AgentId,this))
+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId,this))
             {
                 //Needs later group support
                 LandData newData = landData.Copy();
 
                 if (args.AuthBuyerID != newData.AuthBuyerID || args.SalePrice != newData.SalePrice)
                 {
-                    if (m_scene.ExternalChecks.ExternalChecksCanSellParcel(remote_client.AgentId, this))
+                    if (m_scene.Permissions.CanSellParcel(remote_client.AgentId, this))
                     {
                         newData.AuthBuyerID = args.AuthBuyerID;
                         newData.SalePrice = args.SalePrice;
@@ -647,7 +647,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
 
         public void sendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client)
         {
-            if (m_scene.ExternalChecks.ExternalChecksCanEditParcel(remote_client.AgentId, this))
+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))
             {
                 List<uint> resultLocalIDs = new List<uint>();
                 try
@@ -697,7 +697,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
         /// </param>
         public void sendLandObjectOwners(IClientAPI remote_client)
         {
-            if (m_scene.ExternalChecks.ExternalChecksCanEditParcel(remote_client.AgentId, this))
+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))
             {
                 Dictionary<UUID, int> primCount = new Dictionary<UUID, int>();