Reintroduce a check that was dropped from permissions

This commit is contained in:
Melanie
2010-03-10 05:31:34 +00:00
parent f58a0394ed
commit 04a6b1caf8

View File

@@ -618,7 +618,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return objectOwnerMask;
// Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set
if (IsEstateManager(user) && m_RegionOwnerIsGod)
if (m_RegionOwnerIsGod && IsEstateManager(user) && !IsAdministrator(objectOwner))
return objectOwnerMask;
// Admin should be able to edit anything in the sim (including admin objects)