From 24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 17 Apr 2012 01:25:41 +0100
Subject: refactor: Rename EstateSettings.IsEstateManager() to
 EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.

This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
---
 OpenSim/Framework/EstateSettings.cs              | 4 ++--
 OpenSim/Framework/Tests/MundaneFrameworkTests.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 98604f2..a92abbf 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Framework
                 l_EstateManagers.Remove(avatarID);
         }
 
-        public bool IsEstateManager(UUID avatarID)
+        public bool IsEstateManagerOrOwner(UUID avatarID)
         {
             if (IsEstateOwner(avatarID))
                 return true;
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
 
         public bool HasAccess(UUID user)
         {
-            if (IsEstateManager(user))
+            if (IsEstateManagerOrOwner(user))
                 return true;
 
             return l_EstateAccess.Contains(user);
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index 76de6be..672847d 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -227,10 +227,10 @@ namespace OpenSim.Framework.Tests
             es.AddEstateManager(UUID.Zero);
 
             es.AddEstateManager(bannedUserId);
-            Assert.IsTrue(es.IsEstateManager(bannedUserId), "bannedUserId should be EstateManager but isn't.");
+            Assert.IsTrue(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserId should be EstateManager but isn't.");
 
             es.RemoveEstateManager(bannedUserId);
-            Assert.IsFalse(es.IsEstateManager(bannedUserId), "bannedUserID is estateManager but shouldn't be");
+            Assert.IsFalse(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserID is estateManager but shouldn't be");
 
             Assert.IsFalse(es.HasAccess(bannedUserId), "bannedUserID has access but shouldn't");
 
-- 
cgit v1.1