From 31fb448cfc9c43532c38a58fff75fb6c0e67d632 Mon Sep 17 00:00:00 2001
From: Tom
Date: Wed, 26 Jan 2011 17:06:17 -0800
Subject: Mostly revert the last commit with the aim of searching for a better
 solution

---
 .../UserAccounts/LocalUserAccountServiceConnector.cs    | 17 ++++-------------
 OpenSim/Region/Framework/Scenes/Scene.cs                |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 54340e6..9ecbcc6 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 99248c1..236e9c1 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;
             //}
         }
-- 
cgit v1.1