From 7ff4c2e50b3df8ea82dc8a27f3b68657fe29226b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Aug 2009 17:07:17 +0100
Subject: Pull out distinct cache system folders and drop cache methods in
 InventoryCache

---
 .../Inventory/InventoryCache.cs                    | 47 ++++++++++++++++------
 1 file changed, 34 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index c8f04a5..73ffc5e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -88,13 +88,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
 
             // If not, go get them and place them in the cache
-            Dictionary<AssetType, InventoryFolderBase> folders = m_Connector.GetSystemFolders(presence.UUID);
+            Dictionary<AssetType, InventoryFolderBase> folders = CacheSystemFolders(presence.UUID);
             m_log.DebugFormat("[INVENTORY CACHE]: OnMakeRootAgent in {0}, fetched system folders for {1} {2}: count {3}", 
                 presence.Scene.RegionInfo.RegionName, presence.Firstname, presence.Lastname, folders.Count);
-
-            if (folders.Count > 0)
-                lock (m_InventoryCache)
-                    m_InventoryCache.Add(presence.UUID, folders);
         }
 
         void OnClientClosed(UUID clientID, Scene scene)
@@ -113,26 +109,51 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                     }
                 }
 
-                // Drop system folders
+                m_log.DebugFormat(
+                    "[INVENTORY CACHE]: OnClientClosed in {0}, user {1} out of sim. Dropping system folders",
+                    scene.RegionInfo.RegionName, clientID);
+                DropCachedSystemFolders(clientID);
+            }
+        }
+
+        /// <summary>
+        /// Cache a user's 'system' folders.
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns>Folders cached</returns>
+        protected Dictionary<AssetType, InventoryFolderBase> CacheSystemFolders(UUID userID)
+        {
+            // If not, go get them and place them in the cache
+            Dictionary<AssetType, InventoryFolderBase> folders = m_Connector.GetSystemFolders(userID);
+
+            if (folders.Count > 0)
                 lock (m_InventoryCache)
-                    if (m_InventoryCache.ContainsKey(clientID))
-                    {
-                        m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, user {1} out of sim. Dropping system folders",
-                            scene.RegionInfo.RegionName, clientID);
+                    m_InventoryCache.Add(userID, folders);
 
-                        m_InventoryCache.Remove(clientID);
-                    }
-            }
+            return folders;
         }
 
+        /// <summary>
+        /// Drop a user's cached 'system' folders
+        /// </summary>
+        /// <param name="userID"></param>
+        protected void DropCachedSystemFolders(UUID userID)
+        {
+            // Drop system folders
+            lock (m_InventoryCache)
+                if (m_InventoryCache.ContainsKey(userID))
+                    m_InventoryCache.Remove(userID);
+        }
 
         public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
         {
             Dictionary<AssetType, InventoryFolderBase> folders = null;
+            
             lock (m_InventoryCache)
             {
                 m_InventoryCache.TryGetValue(userID, out folders);
             }
+            
             if ((folders != null) && folders.ContainsKey(type))
             {
                 return folders[type];
-- 
cgit v1.1


From 18c5dc0953a1c142fd8c13658f6183d5b3c3482a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Aug 2009 17:19:45 +0100
Subject: Try to cache system folders if they aren't already there when one is
 requested This operation can be performed legitimately on standalones without
 a logged in user

---
 .../ServiceConnectorsOut/Inventory/InventoryCache.cs        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index 73ffc5e..3c3534f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -145,6 +145,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                     m_InventoryCache.Remove(userID);
         }
 
+        /// <summary>
+        /// Get the system folder for a particular asset type
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
         public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
         {
             Dictionary<AssetType, InventoryFolderBase> folders = null;
@@ -152,6 +158,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             lock (m_InventoryCache)
             {
                 m_InventoryCache.TryGetValue(userID, out folders);
+
+                // In some situations (such as non-secured standalones), system folders can be requested without
+                // the user being logged in.  So we need to try caching them here if we don't already have them.
+                if (null == folders)
+                    CacheSystemFolders(userID);
+
+                m_InventoryCache.TryGetValue(userID, out folders);
             }
             
             if ((folders != null) && folders.ContainsKey(type))
-- 
cgit v1.1