Mostly revert the last commit with the aim of searching for a better solution

5 files changed, 0 insertions, 21 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index fe4e2bf..801b424 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -131,11 +131,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
-            return GetUserAccount(scopeID, userID, true);
-        }
-
-        public UserAccount GetUserAccount(UUID scopeID, UUID userID, bool useCache)
-        {
             // Cache check
             UserAccount account;
             if (m_accountCache.TryGetValue(userID, out account))
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
index c21b250..205a4aa 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
@@ -113,11 +113,6 @@ namespace OpenSim.Services.Connectors
 
         public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
-            return GetUserAccount(scopeID, userID, true);
-        }
-
-        public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID, bool useCache)
-        {
             //m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccount {0}", userID);
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             //sendData["SCOPEID"] = scopeID.ToString();
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs
index bbc531e..e0a3e61 100644
--- a/OpenSim/Services/HypergridService/UserAccountCache.cs
+++ b/OpenSim/Services/HypergridService/UserAccountCache.cs
@@ -80,11 +80,6 @@ namespace OpenSim.Services.HypergridService
             return GetUser(userID.ToString());
         }
 
-        public UserAccount GetUserAccount(UUID scopeID, UUID userID, bool useCache)
-        {
-            return GetUser(userID.ToString());
-        }
-
         public UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName)
         {
             return null;
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 21be98c..a91aa0f 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -143,7 +143,6 @@ namespace OpenSim.Services.Interfaces
 
     public interface IUserAccountService
     {
-        UserAccount GetUserAccount(UUID scopeID, UUID userID, bool useCache);
         UserAccount GetUserAccount(UUID scopeID, UUID userID);
         UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName);
         UserAccount GetUserAccount(UUID scopeID, string Email);
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index b914668..cbd6f35 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -208,11 +208,6 @@ namespace OpenSim.Services.UserAccountService
 
         public UserAccount GetUserAccount(UUID scopeID, UUID principalID)
         {
-            return GetUserAccount(scopeID, principalID, true);
-        }
-
-        public UserAccount GetUserAccount(UUID scopeID, UUID principalID, bool useCache)
-        {
             UserAccountData[] d;
 
             if (scopeID != UUID.Zero)