diff options
author | Melanie Thielker | 2008-08-14 18:08:22 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-14 18:08:22 +0000 |
commit | c2f1771c63108c78b799a4f107cabe7e33984866 (patch) | |
tree | 40b76fc02e6ec938d841f3d51f11417131cfb850 /OpenSim/Region/Environment/Modules/World/Permissions | |
parent | Mantis #1953 (diff) | |
download | opensim-SC_OLD-c2f1771c63108c78b799a4f107cabe7e33984866.zip opensim-SC_OLD-c2f1771c63108c78b799a4f107cabe7e33984866.tar.gz opensim-SC_OLD-c2f1771c63108c78b799a4f107cabe7e33984866.tar.bz2 opensim-SC_OLD-c2f1771c63108c78b799a4f107cabe7e33984866.tar.xz |
Make the estate owner work. Changes permissions checks to allow the
estate owner user the ability to add and remove estate managers,
and have EM rights outside of that.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 0dfcb44..25ea282 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -626,11 +626,17 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
626 | return GenericCommunicationPermission(user, target); | 626 | return GenericCommunicationPermission(user, target); |
627 | } | 627 | } |
628 | 628 | ||
629 | private bool CanIssueEstateCommand(LLUUID user, Scene requestFromScene) | 629 | private bool CanIssueEstateCommand(LLUUID user, Scene requestFromScene, bool ownerCommand) |
630 | { | 630 | { |
631 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 631 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
632 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 632 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
633 | 633 | ||
634 | if (m_scene.RegionInfo.EstateSettings.IsEstateOwner(user)) | ||
635 | return true; | ||
636 | |||
637 | if (ownerCommand) | ||
638 | return false; | ||
639 | |||
634 | return GenericEstatePermission(user); | 640 | return GenericEstatePermission(user); |
635 | } | 641 | } |
636 | 642 | ||