diff options
author | Melanie | 2010-01-05 15:39:53 +0000 |
---|---|---|
committer | Melanie | 2010-01-05 16:04:57 +0000 |
commit | a542871c1590e9d6d42fb3b1e099a8d6204e8e4d (patch) | |
tree | 88c2dfa6b80288b580a16f1ff6a51e5b58974240 /OpenSim/Region/CoreModules/World/Permissions | |
parent | Add the XInventoryServicesConnector, a new inventory connector without the cruft (diff) | |
download | opensim-SC_OLD-a542871c1590e9d6d42fb3b1e099a8d6204e8e4d.zip opensim-SC_OLD-a542871c1590e9d6d42fb3b1e099a8d6204e8e4d.tar.gz opensim-SC_OLD-a542871c1590e9d6d42fb3b1e099a8d6204e8e4d.tar.bz2 opensim-SC_OLD-a542871c1590e9d6d42fb3b1e099a8d6204e8e4d.tar.xz |
Allow estate managers (if estate_owner_is_god is set) to actually enter
god mode. Allow god modification of objects if the object owner is the
same god that wants to modify, this allows you to regain perms on your
own objects after IAR import messed them up.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index e837e9a..f66f01f 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -596,7 +596,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
596 | return objectOwnerMask; | 596 | return objectOwnerMask; |
597 | 597 | ||
598 | // Estate users should be able to edit anything in the sim | 598 | // Estate users should be able to edit anything in the sim |
599 | if (IsEstateManager(user) && m_RegionOwnerIsGod && !IsAdministrator(objectOwner)) | 599 | if (IsEstateManager(user) && m_RegionOwnerIsGod && (!IsAdministrator(objectOwner)) || objectOwner == user) |
600 | return objectOwnerMask; | 600 | return objectOwnerMask; |
601 | 601 | ||
602 | // Admin should be able to edit anything in the sim (including admin objects) | 602 | // Admin should be able to edit anything in the sim (including admin objects) |
@@ -888,6 +888,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
888 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 888 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
889 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 889 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
890 | 890 | ||
891 | if (IsEstateManager(user) && m_RegionOwnerIsGod) | ||
892 | return true; | ||
893 | |||
891 | return IsAdministrator(user); | 894 | return IsAdministrator(user); |
892 | } | 895 | } |
893 | 896 | ||