aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-05 15:39:53 +0000
committerMelanie2010-01-05 15:39:53 +0000
commit3724a38ab4694c75288cbf4ba848bd9894b5231d (patch)
treec3909778afd1ee0f3ddc4f19fa4f8ec615a6cd38
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-3724a38ab4694c75288cbf4ba848bd9894b5231d.zip
opensim-SC-3724a38ab4694c75288cbf4ba848bd9894b5231d.tar.gz
opensim-SC-3724a38ab4694c75288cbf4ba848bd9894b5231d.tar.bz2
opensim-SC-3724a38ab4694c75288cbf4ba848bd9894b5231d.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.
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs5
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