Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.

1 files changed, 105 insertions, 0 deletions

diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs
new file mode 100644
index 0000000..3e9aea1
--- /dev/null
+++ b/OpenSim/Services/HypergridService/UserAccountCache.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+using log4net;
+using OpenMetaverse;
+
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Services.HypergridService
+{
+    public class UserAccountCache : IUserAccountService
+    {
+        private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
+
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        private ExpiringCache<UUID, UserAccount> m_UUIDCache;
+
+        private IUserAccountService m_UserAccountService;
+
+        private static UserAccountCache m_Singleton;
+
+        public static UserAccountCache CreateUserAccountCache(IUserAccountService u)
+        {
+            if (m_Singleton == null)
+                m_Singleton = new UserAccountCache(u);
+
+            return m_Singleton;
+        }
+
+        private UserAccountCache(IUserAccountService u)
+        {
+            m_UUIDCache = new ExpiringCache<UUID, UserAccount>();
+            m_UserAccountService = u;
+        }
+
+        public void Cache(UUID userID, UserAccount account)
+        {
+            // Cache even null accounts
+            m_UUIDCache.AddOrUpdate(userID, account, CACHE_EXPIRATION_SECONDS);
+
+            //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
+        }
+
+        public UserAccount Get(UUID userID, out bool inCache)
+        {
+            UserAccount account = null;
+            inCache = false;
+            if (m_UUIDCache.TryGetValue(userID, out account))
+            {
+                //m_log.DebugFormat("[USER CACHE]: Account {0} {1} found in cache", account.FirstName, account.LastName);
+                inCache = true;
+                return account;
+            }
+
+            return null;
+        }
+
+        public UserAccount GetUser(string id)
+        {
+            UUID uuid = UUID.Zero;
+            UUID.TryParse(id, out uuid);
+            bool inCache = false;
+            UserAccount account = Get(uuid, out inCache);
+            if (!inCache)
+            {
+                account = m_UserAccountService.GetUserAccount(UUID.Zero, uuid);
+                Cache(uuid, account);
+            }
+
+            return account;
+        }
+
+        #region IUserAccountService
+        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+        {
+            return GetUser(userID.ToString());
+        }
+
+        public UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName)
+        {
+            return null;
+        }
+
+        public UserAccount GetUserAccount(UUID scopeID, string Email)
+        {
+            return null;
+        }
+
+        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+        {
+            return null;
+        }
+
+        public bool StoreUserAccount(UserAccount data)
+        {
+            return false;
+        }
+        #endregion
+
+    }
+
+}