aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-14 18:08:22 +0000
committerMelanie Thielker2008-08-14 18:08:22 +0000
commitc2f1771c63108c78b799a4f107cabe7e33984866 (patch)
tree40b76fc02e6ec938d841f3d51f11417131cfb850 /OpenSim/Framework
parentMantis #1953 (diff)
downloadopensim-SC_OLD-c2f1771c63108c78b799a4f107cabe7e33984866.zip
opensim-SC_OLD-c2f1771c63108c78b799a4f107cabe7e33984866.tar.gz
opensim-SC_OLD-c2f1771c63108c78b799a4f107cabe7e33984866.tar.bz2
opensim-SC_OLD-c2f1771c63108c78b799a4f107cabe7e33984866.tar.xz
Make the estate owner work. Changes permissions checks to allow the
estate owner user the ability to add and remove estate managers, and have EM rights outside of that.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/EstateSettings.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 8a00f9d..8b076fe 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -312,9 +312,20 @@ namespace OpenSim.Framework
312 312
313 public bool IsEstateManager(LLUUID avatarID) 313 public bool IsEstateManager(LLUUID avatarID)
314 { 314 {
315 if (IsEstateOwner(avatarID))
316 return true;
317
315 return l_EstateManagers.Contains(avatarID); 318 return l_EstateManagers.Contains(avatarID);
316 } 319 }
317 320
321 public bool IsEstateOwner(LLUUID avatarID)
322 {
323 if (avatarID == m_EstateOwner)
324 return true;
325
326 return false;
327 }
328
318 public bool IsBanned(LLUUID avatarID) 329 public bool IsBanned(LLUUID avatarID)
319 { 330 {
320 foreach (EstateBan ban in l_EstateBans) 331 foreach (EstateBan ban in l_EstateBans)