aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/PermissionManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/PermissionManager.cs')
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs15
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 76601ec..db1cac5 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -83,13 +83,20 @@ namespace OpenSim.Region.Environment
83 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; 83 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
84 } 84 }
85 85
86 protected virtual bool IsEstateManager(LLUUID user) 86 public virtual bool IsEstateManager(LLUUID user)
87 { 87 {
88 if (m_bypassPermissions) 88 if (m_bypassPermissions)
89 { 89 {
90 return true; 90 return true;
91 } 91 }
92 92
93 LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers;
94 for (int i = 0; i < estatemanagers.Length; i++)
95 {
96 if (estatemanagers[i] == user)
97 return true;
98 }
99
93 return false; 100 return false;
94 } 101 }
95 102
@@ -414,7 +421,7 @@ namespace OpenSim.Region.Environment
414 421
415 #region Estate Permissions 422 #region Estate Permissions
416 423
417 protected virtual bool GenericEstatePermission(LLUUID user) 424 public virtual bool GenericEstatePermission(LLUUID user)
418 { 425 {
419 // Default: deny 426 // Default: deny
420 bool permission = false; 427 bool permission = false;
@@ -439,8 +446,8 @@ namespace OpenSim.Region.Environment
439 { 446 {
440 // Since this is potentially going on a grid... 447 // Since this is potentially going on a grid...
441 448
442 //return GenericEstatePermission(AgentId); 449 return GenericEstatePermission(user);
443 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; 450 //return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
444 } 451 }
445 452
446 #endregion 453 #endregion