aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-13 01:17:44 +0000
committerMelanie Thielker2008-08-13 01:17:44 +0000
commit71cc4586105d667291d5e4d0c35daba2ee29b881 (patch)
treef274dd8f686772fa8d6877c1ebc466813d77a0bd /OpenSim/Region/Environment
parentFix data format for last commit (diff)
downloadopensim-SC_OLD-71cc4586105d667291d5e4d0c35daba2ee29b881.zip
opensim-SC_OLD-71cc4586105d667291d5e4d0c35daba2ee29b881.tar.gz
opensim-SC_OLD-71cc4586105d667291d5e4d0c35daba2ee29b881.tar.bz2
opensim-SC_OLD-71cc4586105d667291d5e4d0c35daba2ee29b881.tar.xz
Make the estate owner UUID from the database have the same rights
as the region master avatar, unless it's LLUUID.Zero (the default).
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index f9a0bdb..0dfcb44 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -238,7 +238,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
238 // If there is no master avatar, return false 238 // If there is no master avatar, return false
239 if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) 239 if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
240 { 240 {
241 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; 241 if(m_scene.RegionInfo.MasterAvatarAssignedUUID == user)
242 return true;
243 }
244 if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
245 {
246 if(m_scene.RegionInfo.EstateSettings.EstateOwner == user)
247 return true;
242 } 248 }
243 249
244 return false; 250 return false;