diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs index 54340e650e..9ecbcc631e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs @@ -142,19 +142,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts public UserAccount GetUserAccount(UUID scopeID, UUID userID) { - return GetUserAccount(scopeID, userID, true); - } - - public UserAccount GetUserAccount(UUID scopeID, UUID userID, bool useCache) - { - UserAccount account; - if (useCache) - { - bool inCache = false; - account = m_Cache.Get(userID, out inCache); - if (inCache) - return account; - } + bool inCache = false; + UserAccount account = m_Cache.Get(userID, out inCache); + if (inCache) + return account; account = m_UserService.GetUserAccount(scopeID, userID); m_Cache.Cache(userID, account); diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 99248c197d..236e9c1f6c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -2559,7 +2559,7 @@ namespace OpenSim.Region.Framework.Scenes else { */ - UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user, false); + UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user); return uac.UserFlags; //} } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index fe4e2bf621..801b424115 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs @@ -130,11 +130,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; diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs index c21b2500bd..205a4aa94f 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs @@ -112,11 +112,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 sendData = new Dictionary(); diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs index bbc531e43e..e0a3e613d2 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 21be98cfa5..a91aa0f8f3 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 b914668704..cbd6f35e10 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs @@ -207,11 +207,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;