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 | |
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 'OpenSim/Region/Environment/Modules/World')
5 files changed, 61 insertions, 61 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 4aad3b1..d4f53ff 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
63 | else | 63 | else |
64 | estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 64 | estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
65 | 65 | ||
66 | if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remote_client.AgentId)) | 66 | if (m_scene.Permissions.IsGod(remote_client.AgentId)) |
67 | estateOwner = remote_client.AgentId; | 67 | estateOwner = remote_client.AgentId; |
68 | 68 | ||
69 | remote_client.SendDetailedEstateData(invoice, | 69 | remote_client.SendDetailedEstateData(invoice, |
@@ -233,7 +233,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
233 | switch (estateAccessType) | 233 | switch (estateAccessType) |
234 | { | 234 | { |
235 | case 64: | 235 | case 64: |
236 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remote_client.AgentId, false) || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 236 | if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions()) |
237 | { | 237 | { |
238 | EstateBan[] banlistcheck = m_scene.RegionInfo.EstateSettings.EstateBans; | 238 | EstateBan[] banlistcheck = m_scene.RegionInfo.EstateSettings.EstateBans; |
239 | 239 | ||
@@ -285,7 +285,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
285 | } | 285 | } |
286 | break; | 286 | break; |
287 | case 128: | 287 | case 128: |
288 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remote_client.AgentId, false) || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 288 | if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions()) |
289 | { | 289 | { |
290 | EstateBan[] banlistcheck = m_scene.RegionInfo.EstateSettings.EstateBans; | 290 | EstateBan[] banlistcheck = m_scene.RegionInfo.EstateSettings.EstateBans; |
291 | 291 | ||
@@ -321,7 +321,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
321 | break; | 321 | break; |
322 | case 256: | 322 | case 256: |
323 | 323 | ||
324 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remote_client.AgentId, true) || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 324 | if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) |
325 | { | 325 | { |
326 | m_scene.RegionInfo.EstateSettings.AddEstateManager(user); | 326 | m_scene.RegionInfo.EstateSettings.AddEstateManager(user); |
327 | m_scene.RegionInfo.EstateSettings.Save(); | 327 | m_scene.RegionInfo.EstateSettings.Save(); |
@@ -334,7 +334,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
334 | 334 | ||
335 | break; | 335 | break; |
336 | case 512: | 336 | case 512: |
337 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remote_client.AgentId, true) || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 337 | if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) |
338 | { | 338 | { |
339 | m_scene.RegionInfo.EstateSettings.RemoveEstateManager(user); | 339 | m_scene.RegionInfo.EstateSettings.RemoveEstateManager(user); |
340 | m_scene.RegionInfo.EstateSettings.Save(); | 340 | m_scene.RegionInfo.EstateSettings.Save(); |
@@ -742,7 +742,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
742 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 742 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
743 | 743 | ||
744 | // Fudge estate owner | 744 | // Fudge estate owner |
745 | //if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remoteClient.AgentId)) | 745 | //if (m_scene.Permissions.IsGod(remoteClient.AgentId)) |
746 | // args.SimOwner = remoteClient.AgentId; | 746 | // args.SimOwner = remoteClient.AgentId; |
747 | 747 | ||
748 | args.terrainBase0 = UUID.Zero; | 748 | args.terrainBase0 = UUID.Zero; |
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 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index d7865b2..9eeff0f 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -180,50 +180,50 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
180 | m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks"); | 180 | m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks"); |
181 | 181 | ||
182 | //Register functions with Scene External Checks! | 182 | //Register functions with Scene External Checks! |
183 | m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED | 183 | m_scene.Permissions.AddBypassPermissionsHandler(BypassPermissions); //FULLY IMPLEMENTED |
184 | m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED | 184 | m_scene.Permissions.AddSetBypassPermissionsHandler(SetBypassPermissions); //FULLY IMPLEMENTED |
185 | m_scene.ExternalChecks.addPropagatePermissions(PropagatePermissions); //FULLY IMPLEMENTED | 185 | m_scene.Permissions.AddPropagatePermissionsHandler(PropagatePermissions); //FULLY IMPLEMENTED |
186 | m_scene.ExternalChecks.addCheckAbandonParcel(CanAbandonParcel); //FULLY IMPLEMENTED | 186 | m_scene.Permissions.AddGenerateClientFlagsHandler(GenerateClientFlags); //NOT YET FULLY IMPLEMENTED |
187 | m_scene.ExternalChecks.addCheckReclaimParcel(CanReclaimParcel); //FULLY IMPLEMENTED | 187 | m_scene.Permissions.AddAbandonParcelHandler(CanAbandonParcel); //FULLY IMPLEMENTED |
188 | m_scene.ExternalChecks.addGenerateClientFlags(GenerateClientFlags); //NOT YET FULLY IMPLEMENTED | 188 | m_scene.Permissions.AddReclaimParcelHandler(CanReclaimParcel); //FULLY IMPLEMENTED |
189 | m_scene.ExternalChecks.addCheckBeGodLike(CanBeGodLike); //FULLY IMPLEMENTED | 189 | m_scene.Permissions.AddIsGodHandler(IsGod); //FULLY IMPLEMENTED |
190 | m_scene.ExternalChecks.addCheckDuplicateObject(CanDuplicateObject); //FULLY IMPLEMENTED | 190 | m_scene.Permissions.AddDuplicateObjectHandler(CanDuplicateObject); //FULLY IMPLEMENTED |
191 | m_scene.ExternalChecks.addCheckDeleteObject(CanDeleteObject); //MAYBE FULLY IMPLEMENTED | 191 | m_scene.Permissions.AddDeleteObjectHandler(CanDeleteObject); //MAYBE FULLY IMPLEMENTED |
192 | m_scene.ExternalChecks.addCheckEditObject(CanEditObject);//MAYBE FULLY IMPLEMENTED | 192 | m_scene.Permissions.AddEditObjectHandler(CanEditObject);//MAYBE FULLY IMPLEMENTED |
193 | m_scene.ExternalChecks.addCheckEditParcel(CanEditParcel); //FULLY IMPLEMENTED | 193 | m_scene.Permissions.AddEditParcelHandler(CanEditParcel); //FULLY IMPLEMENTED |
194 | m_scene.ExternalChecks.addCheckInstantMessage(CanInstantMessage); //FULLY IMPLEMENTED | 194 | m_scene.Permissions.AddInstantMessageHandler(CanInstantMessage); //FULLY IMPLEMENTED |
195 | m_scene.ExternalChecks.addCheckInventoryTransfer(CanInventoryTransfer); //NOT YET IMPLEMENTED | 195 | m_scene.Permissions.AddInventoryTransferHandler(CanInventoryTransfer); //NOT YET IMPLEMENTED |
196 | m_scene.ExternalChecks.addCheckIssueEstateCommand(CanIssueEstateCommand); //FULLY IMPLEMENTED | 196 | m_scene.Permissions.AddIssueEstateCommandHandler(CanIssueEstateCommand); //FULLY IMPLEMENTED |
197 | m_scene.ExternalChecks.addCheckMoveObject(CanMoveObject); //HOPEFULLY FULLY IMPLEMENTED | 197 | m_scene.Permissions.AddMoveObjectHandler(CanMoveObject); //HOPEFULLY FULLY IMPLEMENTED |
198 | m_scene.ExternalChecks.addCheckObjectEntry(CanObjectEntry); //FULLY IMPLEMENTED | 198 | m_scene.Permissions.AddObjectEntryHandler(CanObjectEntry); //FULLY IMPLEMENTED |
199 | m_scene.ExternalChecks.addCheckReturnObject(CanReturnObject); //NOT YET IMPLEMENTED | 199 | m_scene.Permissions.AddReturnObjectHandler(CanReturnObject); //NOT YET IMPLEMENTED |
200 | m_scene.ExternalChecks.addCheckRezObject(CanRezObject); //HOPEFULLY FULLY IMPLEMENTED | 200 | m_scene.Permissions.AddRezObjectHandler(CanRezObject); //HOPEFULLY FULLY IMPLEMENTED |
201 | m_scene.ExternalChecks.addCheckRunConsoleCommand(CanRunConsoleCommand); //FULLY IMPLEMENTED | 201 | m_scene.Permissions.AddRunConsoleCommandHandler(CanRunConsoleCommand); //FULLY IMPLEMENTED |
202 | m_scene.ExternalChecks.addCheckRunScript(CanRunScript); //NOT YET IMPLEMENTED | 202 | m_scene.Permissions.AddRunScriptHandler(CanRunScript); //NOT YET IMPLEMENTED |
203 | m_scene.ExternalChecks.addCheckSellParcel(CanSellParcel); //FULLY IMPLEMENTED | 203 | m_scene.Permissions.AddSellParcelHandler(CanSellParcel); //FULLY IMPLEMENTED |
204 | m_scene.ExternalChecks.addCheckTakeObject(CanTakeObject); //FULLY IMPLEMENTED | 204 | m_scene.Permissions.AddTakeObjectHandler(CanTakeObject); //FULLY IMPLEMENTED |
205 | m_scene.ExternalChecks.addCheckTakeCopyObject(CanTakeCopyObject); //FULLY IMPLEMENTED | 205 | m_scene.Permissions.AddTakeCopyObjectHandler(CanTakeCopyObject); //FULLY IMPLEMENTED |
206 | m_scene.ExternalChecks.addCheckTerraformLand(CanTerraformLand); //FULL IMPLEMENTED (POINT ONLY!!! NOT AREA!!!) | 206 | m_scene.Permissions.AddTerraformLandHandler(CanTerraformLand); //FULL IMPLEMENTED (POINT ONLY!!! NOT AREA!!!) |
207 | m_scene.ExternalChecks.addCheckCanLinkObject(CanLinkObject); //NOT YET IMPLEMENTED | 207 | m_scene.Permissions.AddCanLinkObjectHandler(CanLinkObject); //NOT YET IMPLEMENTED |
208 | m_scene.ExternalChecks.addCheckCanDelinkObject(CanDelinkObject); //NOT YET IMPLEMENTED | 208 | m_scene.Permissions.AddCanDelinkObjectHandler(CanDelinkObject); //NOT YET IMPLEMENTED |
209 | m_scene.ExternalChecks.addCheckCanBuyLand(CanBuyLand); //NOT YET IMPLEMENTED | 209 | m_scene.Permissions.AddCanBuyLandHandler(CanBuyLand); //NOT YET IMPLEMENTED |
210 | 210 | ||
211 | m_scene.ExternalChecks.addCheckViewNotecard(CanViewNotecard); //NOT YET IMPLEMENTED | 211 | m_scene.Permissions.AddViewNotecardHandler(CanViewNotecard); //NOT YET IMPLEMENTED |
212 | m_scene.ExternalChecks.addCheckViewScript(CanViewScript); //NOT YET IMPLEMENTED | 212 | m_scene.Permissions.AddViewScriptHandler(CanViewScript); //NOT YET IMPLEMENTED |
213 | m_scene.ExternalChecks.addCheckEditNotecard(CanEditNotecard); //NOT YET IMPLEMENTED | 213 | m_scene.Permissions.AddEditNotecardHandler(CanEditNotecard); //NOT YET IMPLEMENTED |
214 | m_scene.ExternalChecks.addCheckEditScript(CanEditScript); //NOT YET IMPLEMENTED | 214 | m_scene.Permissions.AddEditScriptHandler(CanEditScript); //NOT YET IMPLEMENTED |
215 | 215 | ||
216 | m_scene.ExternalChecks.addCheckCanCreateObjectInventory(CanCreateObjectInventory); //NOT IMPLEMENTED HERE | 216 | m_scene.Permissions.AddCanCreateObjectInventoryHandler(CanCreateObjectInventory); //NOT IMPLEMENTED HERE |
217 | m_scene.ExternalChecks.addCheckEditObjectInventory(CanEditObjectInventory);//MAYBE FULLY IMPLEMENTED | 217 | m_scene.Permissions.AddEditObjectInventoryHandler(CanEditObjectInventory);//MAYBE FULLY IMPLEMENTED |
218 | m_scene.ExternalChecks.addCheckCanCopyObjectInventory(CanCopyObjectInventory); //NOT YET IMPLEMENTED | 218 | m_scene.Permissions.AddCanCopyObjectInventoryHandler(CanCopyObjectInventory); //NOT YET IMPLEMENTED |
219 | m_scene.ExternalChecks.addCheckCanDeleteObjectInventory(CanDeleteObjectInventory); //NOT YET IMPLEMENTED | 219 | m_scene.Permissions.AddCanDeleteObjectInventoryHandler(CanDeleteObjectInventory); //NOT YET IMPLEMENTED |
220 | 220 | ||
221 | m_scene.ExternalChecks.addCheckCanCreateUserInventory(CanCreateUserInventory); //NOT YET IMPLEMENTED | 221 | m_scene.Permissions.AddCanCreateUserInventoryHandler(CanCreateUserInventory); //NOT YET IMPLEMENTED |
222 | m_scene.ExternalChecks.addCheckCanCopyUserInventory(CanCopyUserInventory); //NOT YET IMPLEMENTED | 222 | m_scene.Permissions.AddCanCopyUserInventoryHandler(CanCopyUserInventory); //NOT YET IMPLEMENTED |
223 | m_scene.ExternalChecks.addCheckCanEditUserInventory(CanEditUserInventory); //NOT YET IMPLEMENTED | 223 | m_scene.Permissions.AddCanEditUserInventoryHandler(CanEditUserInventory); //NOT YET IMPLEMENTED |
224 | m_scene.ExternalChecks.addCheckCanDeleteUserInventory(CanDeleteUserInventory); //NOT YET IMPLEMENTED | 224 | m_scene.Permissions.AddCanDeleteUserInventoryHandler(CanDeleteUserInventory); //NOT YET IMPLEMENTED |
225 | 225 | ||
226 | m_scene.ExternalChecks.addCheckCanTeleport(CanTeleport); //NOT YET IMPLEMENTED | 226 | m_scene.Permissions.AddCanTeleportHandler(CanTeleport); //NOT YET IMPLEMENTED |
227 | 227 | ||
228 | //Register Debug Commands | 228 | //Register Debug Commands |
229 | Command bypassCommand = new Command("bypass", CommandIntentions.COMMAND_HAZARDOUS, InterfaceBypassPermissions, "Force the permissions a specific way to test permissions"); | 229 | Command bypassCommand = new Command("bypass", CommandIntentions.COMMAND_HAZARDOUS, InterfaceBypassPermissions, "Force the permissions a specific way to test permissions"); |
@@ -651,7 +651,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
651 | return GenericParcelPermission(user, parcel); | 651 | return GenericParcelPermission(user, parcel); |
652 | } | 652 | } |
653 | 653 | ||
654 | private bool CanBeGodLike(UUID user, Scene scene) | 654 | private bool IsGod(UUID user, Scene scene) |
655 | { | 655 | { |
656 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 656 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
657 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 657 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs index 3170724..5646de1 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs | |||
@@ -616,7 +616,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain | |||
616 | private void client_OnModifyTerrain(UUID user, float height, float seconds, byte size, byte action, | 616 | private void client_OnModifyTerrain(UUID user, float height, float seconds, byte size, byte action, |
617 | float north, float west, float south, float east, UUID agentId) | 617 | float north, float west, float south, float east, UUID agentId) |
618 | { | 618 | { |
619 | bool god = m_scene.ExternalChecks.ExternalChecksCanBeGodLike(user); | 619 | bool god = m_scene.Permissions.IsGod(user); |
620 | bool allowed = false; | 620 | bool allowed = false; |
621 | if (north == south && east == west) | 621 | if (north == south && east == west) |
622 | { | 622 | { |
@@ -641,7 +641,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain | |||
641 | int y = zy + dy; | 641 | int y = zy + dy; |
642 | if (x>=0 && y>=0 && x<m_channel.Width && y<m_channel.Height) | 642 | if (x>=0 && y>=0 && x<m_channel.Width && y<m_channel.Height) |
643 | { | 643 | { |
644 | if (m_scene.ExternalChecks.ExternalChecksCanTerraformLand(agentId, new Vector3(x,y,0))) | 644 | if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x,y,0))) |
645 | { | 645 | { |
646 | allowMask[x, y] = true; | 646 | allowMask[x, y] = true; |
647 | allowed = true; | 647 | allowed = true; |
@@ -679,7 +679,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain | |||
679 | { | 679 | { |
680 | if (y < north && y > south) | 680 | if (y < north && y > south) |
681 | { | 681 | { |
682 | if (m_scene.ExternalChecks.ExternalChecksCanTerraformLand(agentId, new Vector3(x,y,0))) | 682 | if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x,y,0))) |
683 | { | 683 | { |
684 | fillArea[x, y] = true; | 684 | fillArea[x, y] = true; |
685 | allowed = true; | 685 | allowed = true; |
@@ -709,7 +709,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain | |||
709 | // Not a good permissions check (see client_OnModifyTerrain above), need to check the entire area. | 709 | // Not a good permissions check (see client_OnModifyTerrain above), need to check the entire area. |
710 | // for now check a point in the centre of the region | 710 | // for now check a point in the centre of the region |
711 | 711 | ||
712 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remoteClient.AgentId, true)) | 712 | if (m_scene.Permissions.CanIssueEstateCommand(remoteClient.AgentId, true)) |
713 | { | 713 | { |
714 | InterfaceBakeTerrain(null); //bake terrain does not use the passed in parameter | 714 | InterfaceBakeTerrain(null); //bake terrain does not use the passed in parameter |
715 | } | 715 | } |