diff options
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs')
-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 3d7516d..8fa0c65 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -607,7 +607,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
607 | return objectOwnerMask; | 607 | return objectOwnerMask; |
608 | 608 | ||
609 | // Estate users should be able to edit anything in the sim | 609 | // Estate users should be able to edit anything in the sim |
610 | if (IsEstateManager(user) && m_RegionOwnerIsGod && !IsAdministrator(objectOwner)) | 610 | if (IsEstateManager(user) && m_RegionOwnerIsGod && (!IsAdministrator(objectOwner)) || objectOwner == user) |
611 | return objectOwnerMask; | 611 | return objectOwnerMask; |
612 | 612 | ||
613 | // Admin should be able to edit anything in the sim (including admin objects) | 613 | // Admin should be able to edit anything in the sim (including admin objects) |
@@ -899,6 +899,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
899 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 899 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
900 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 900 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
901 | 901 | ||
902 | if (IsEstateManager(user) && m_RegionOwnerIsGod) | ||
903 | return true; | ||
904 | |||
902 | return IsAdministrator(user); | 905 | return IsAdministrator(user); |
903 | } | 906 | } |
904 | 907 | ||