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

This commit is contained in:
Tom
2011-01-26 17:06:17 -08:00
parent 6b27587bc7
commit 31fb448cfc
7 changed files with 5 additions and 35 deletions

View File

@@ -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);