diff options
author | Melanie Thielker | 2008-11-21 22:14:57 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-21 22:14:57 +0000 |
commit | ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9 (patch) | |
tree | db636daea691f80b0d8bfd3970b8ced36ef9ced0 /OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |
parent | * Comment out unused access time method in MSSQL (diff) | |
download | opensim-SC_OLD-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.zip opensim-SC_OLD-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.gz opensim-SC_OLD-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.bz2 opensim-SC_OLD-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.xz |
Refactor: Scene.ExternalChecks -> Scene.Permissions. Also make all
the internals of the permissions module adapter sane
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | ||