aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-19 20:55:34 +0000
committerMelanie Thielker2008-08-19 20:55:34 +0000
commit40fa68d3e503d5df7bc10daa98fbe8302ea81efc (patch)
tree75c5b46457ed995daf5e900b16e46ee8d7430fae /OpenSim/Region/Environment/Modules
parentPacket type exclusion (Mantis #2004) (diff)
downloadopensim-SC_OLD-40fa68d3e503d5df7bc10daa98fbe8302ea81efc.zip
opensim-SC_OLD-40fa68d3e503d5df7bc10daa98fbe8302ea81efc.tar.gz
opensim-SC_OLD-40fa68d3e503d5df7bc10daa98fbe8302ea81efc.tar.bz2
opensim-SC_OLD-40fa68d3e503d5df7bc10daa98fbe8302ea81efc.tar.xz
Mantis #1999
Allow the sim owner to add estate managers to any estate on the sim
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 071e3af..eb078d6 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -644,6 +644,9 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
644 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 644 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
645 if (m_bypassPermissions) return m_bypassPermissionsValue; 645 if (m_bypassPermissions) return m_bypassPermissionsValue;
646 646
647 if (IsAdministrator(user))
648 return true;
649
647 if (m_scene.RegionInfo.EstateSettings.IsEstateOwner(user)) 650 if (m_scene.RegionInfo.EstateSettings.IsEstateOwner(user))
648 return true; 651 return true;
649 652