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.mysql-performance
parent
aca01f5415
commit
a542871c15
|
@ -596,7 +596,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
|||
return objectOwnerMask;
|
||||
|
||||
// Estate users should be able to edit anything in the sim
|
||||
if (IsEstateManager(user) && m_RegionOwnerIsGod && !IsAdministrator(objectOwner))
|
||||
if (IsEstateManager(user) && m_RegionOwnerIsGod && (!IsAdministrator(objectOwner)) || objectOwner == user)
|
||||
return objectOwnerMask;
|
||||
|
||||
// Admin should be able to edit anything in the sim (including admin objects)
|
||||
|
@ -888,6 +888,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
|||
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
|
||||
if (m_bypassPermissions) return m_bypassPermissionsValue;
|
||||
|
||||
if (IsEstateManager(user) && m_RegionOwnerIsGod)
|
||||
return true;
|
||||
|
||||
return IsAdministrator(user);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue