Add a "useCached" parameter to GetUserAccount. Add a function to Scene to get the user flags. It has to be here due to access restrictions :/

5 files changed, 21 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 801b424..fe4e2bf 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -131,6 +131,11 @@ 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 205a4aa..c21b250 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
@@ -113,6 +113,11 @@ 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 e0a3e61..bbc531e 100644
--- a/OpenSim/Services/HypergridService/UserAccountCache.cs
+++ b/OpenSim/Services/HypergridService/UserAccountCache.cs
@@ -80,6 +80,11 @@ 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 a91aa0f..21be98c 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -143,6 +143,7 @@ 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 cbd6f35..b914668 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -208,6 +208,11 @@ 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)