aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Land
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs8
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
729 729
730 //If we are still here, then they are subdividing within one piece of land 730 //If we are still here, then they are subdividing within one piece of land
731 //Check owner 731 //Check owner
732 if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(attempting_user_id, startLandObject)) 732 if (!m_scene.Permissions.CanEditParcel(attempting_user_id, startLandObject))
733 { 733 {
734 return; 734 return;
735 } 735 }
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
797 { 797 {
798 return; 798 return;
799 } 799 }
800 if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(attempting_user_id, masterLandObject)) 800 if (!m_scene.Permissions.CanEditParcel(attempting_user_id, masterLandObject))
801 { 801 {
802 return; 802 return;
803 } 803 }
@@ -1009,7 +1009,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
1009 1009
1010 if (land != null) 1010 if (land != null)
1011 { 1011 {
1012 if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remote_client.AgentId)) 1012 if (m_scene.Permissions.IsGod(remote_client.AgentId))
1013 { 1013 {
1014 land.landData.OwnerID = ownerID; 1014 land.landData.OwnerID = ownerID;
1015 1015
@@ -1029,7 +1029,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
1029 1029
1030 if (land != null) 1030 if (land != null)
1031 { 1031 {
1032 if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, land)) 1032 if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land))
1033 { 1033 {
1034 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 1034 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
1035 land.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; 1035 land.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -1051,7 +1051,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
1051 1051
1052 if (land != null) 1052 if (land != null)
1053 { 1053 {
1054 if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, land)) 1054 if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land))
1055 { 1055 {
1056 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 1056 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
1057 land.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; 1057 land.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -1321,7 +1321,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
1321 1321
1322 if (land == null) return; 1322 if (land == null) return;
1323 1323
1324 if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(remoteClient.AgentId, land)) 1324 if (!m_scene.Permissions.CanEditParcel(remoteClient.AgentId, land))
1325 return; 1325 return;
1326 1326
1327 land.landData.OtherCleanTime = otherCleanTime; 1327 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
181 181
182 public void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client) 182 public void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client)
183 { 183 {
184 if (m_scene.ExternalChecks.ExternalChecksCanEditParcel(remote_client.AgentId,this)) 184 if (m_scene.Permissions.CanEditParcel(remote_client.AgentId,this))
185 { 185 {
186 //Needs later group support 186 //Needs later group support
187 LandData newData = landData.Copy(); 187 LandData newData = landData.Copy();
188 188
189 if (args.AuthBuyerID != newData.AuthBuyerID || args.SalePrice != newData.SalePrice) 189 if (args.AuthBuyerID != newData.AuthBuyerID || args.SalePrice != newData.SalePrice)
190 { 190 {
191 if (m_scene.ExternalChecks.ExternalChecksCanSellParcel(remote_client.AgentId, this)) 191 if (m_scene.Permissions.CanSellParcel(remote_client.AgentId, this))
192 { 192 {
193 newData.AuthBuyerID = args.AuthBuyerID; 193 newData.AuthBuyerID = args.AuthBuyerID;
194 newData.SalePrice = args.SalePrice; 194 newData.SalePrice = args.SalePrice;
@@ -647,7 +647,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
647 647
648 public void sendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client) 648 public void sendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client)
649 { 649 {
650 if (m_scene.ExternalChecks.ExternalChecksCanEditParcel(remote_client.AgentId, this)) 650 if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))
651 { 651 {
652 List<uint> resultLocalIDs = new List<uint>(); 652 List<uint> resultLocalIDs = new List<uint>();
653 try 653 try
@@ -697,7 +697,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
697 /// </param> 697 /// </param>
698 public void sendLandObjectOwners(IClientAPI remote_client) 698 public void sendLandObjectOwners(IClientAPI remote_client)
699 { 699 {
700 if (m_scene.ExternalChecks.ExternalChecksCanEditParcel(remote_client.AgentId, this)) 700 if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))
701 { 701 {
702 Dictionary<UUID, int> primCount = new Dictionary<UUID, int>(); 702 Dictionary<UUID, int> primCount = new Dictionary<UUID, int>();
703 703