diff options
author | Charles Krinke | 2008-06-26 13:45:36 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-26 13:45:36 +0000 |
commit | a58a47a7592799813b92aacfb0af4c0b753c899d (patch) | |
tree | 1aa062da5c9d65080c27d8e72347dd143cbea759 /OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |
parent | Mantis#1602. Thank you, Kinoc for a patch to: (diff) | |
download | opensim-SC-a58a47a7592799813b92aacfb0af4c0b753c899d.zip opensim-SC-a58a47a7592799813b92aacfb0af4c0b753c899d.tar.gz opensim-SC-a58a47a7592799813b92aacfb0af4c0b753c899d.tar.bz2 opensim-SC-a58a47a7592799813b92aacfb0af4c0b753c899d.tar.xz |
Mantis#1597. Thank you, Melanie for a patch that:
Adds handlers for the reclaim land functionality,
plus all needed permissions checks.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index a851cad..e8defb7 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -143,6 +143,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
143 | m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED | 143 | m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED |
144 | m_scene.ExternalChecks.addPropagatePermissions(PropagatePermissions); //FULLY IMPLEMENTED | 144 | m_scene.ExternalChecks.addPropagatePermissions(PropagatePermissions); //FULLY IMPLEMENTED |
145 | m_scene.ExternalChecks.addCheckAbandonParcel(CanAbandonParcel); //FULLY IMPLEMENTED | 145 | m_scene.ExternalChecks.addCheckAbandonParcel(CanAbandonParcel); //FULLY IMPLEMENTED |
146 | m_scene.ExternalChecks.addCheckReclaimParcel(CanReclaimParcel); //FULLY IMPLEMENTED | ||
146 | m_scene.ExternalChecks.addGenerateClientFlags(GenerateClientFlags); //NOT YET FULLY IMPLEMENTED | 147 | m_scene.ExternalChecks.addGenerateClientFlags(GenerateClientFlags); //NOT YET FULLY IMPLEMENTED |
147 | m_scene.ExternalChecks.addCheckBeGodLike(CanBeGodLike); //FULLY IMPLEMENTED | 148 | m_scene.ExternalChecks.addCheckBeGodLike(CanBeGodLike); //FULLY IMPLEMENTED |
148 | m_scene.ExternalChecks.addCheckDuplicateObject(CanDuplicateObject); //FULLY IMPLEMENTED | 149 | m_scene.ExternalChecks.addCheckDuplicateObject(CanDuplicateObject); //FULLY IMPLEMENTED |
@@ -531,6 +532,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
531 | return GenericParcelPermission(user, parcel); | 532 | return GenericParcelPermission(user, parcel); |
532 | } | 533 | } |
533 | 534 | ||
535 | private bool CanReclaimParcel(LLUUID user, ILandObject parcel, Scene scene) | ||
536 | { | ||
537 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | ||
538 | if (m_bypassPermissions) return m_bypassPermissionsValue; | ||
539 | |||
540 | return GenericParcelPermission(user, parcel); | ||
541 | } | ||
542 | |||
534 | private bool CanBeGodLike(LLUUID user, Scene scene) | 543 | private bool CanBeGodLike(LLUUID user, Scene scene) |
535 | { | 544 | { |
536 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 545 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |