diff options
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 | ||