aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Permissions
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 7f2b29a..bc86076 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -2032,6 +2032,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
2032 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 2032 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
2033 if (m_bypassPermissions) return m_bypassPermissionsValue; 2033 if (m_bypassPermissions) return m_bypassPermissionsValue;
2034 2034
2035 // A god is a god is a god
2036 if (IsAdministrator(user))
2037 return true;
2038
2035 if (objectID == UUID.Zero) // User inventory 2039 if (objectID == UUID.Zero) // User inventory
2036 { 2040 {
2037 IInventoryService invService = m_scene.InventoryService; 2041 IInventoryService invService = m_scene.InventoryService;
@@ -2121,6 +2125,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
2121 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 2125 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
2122 if (m_bypassPermissions) return m_bypassPermissionsValue; 2126 if (m_bypassPermissions) return m_bypassPermissionsValue;
2123 2127
2128 // A god is a god is a god
2129 if (IsAdministrator(user))
2130 return true;
2131
2124 if (objectID == UUID.Zero) // User inventory 2132 if (objectID == UUID.Zero) // User inventory
2125 { 2133 {
2126 IInventoryService invService = m_scene.InventoryService; 2134 IInventoryService invService = m_scene.InventoryService;