2 files changed, 46 insertions, 15 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 907c8f4..1696d82 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -45,6 +45,7 @@ using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
 using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
@@ -102,6 +103,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 Monitor.Wait(this, 60000);
             }
 
+            Console.WriteLine("here");
+
             // Create asset
             SceneObjectGroup object1;
             SceneObjectPart part1;
@@ -135,8 +138,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
             //userInfo.RootFolder.FindFolderByPath("Objects").ID;
-            InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object);
-            //InventoryFolderBase rootFolder = scene.InventoryService.GetRootFolder(userId);            
+            //InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object);
+            Console.WriteLine("here2");
+            IInventoryService inventoryService = scene.InventoryService;
+            InventoryFolderBase rootFolder = inventoryService.GetRootFolder(userId);
+            InventoryCollection rootContents = inventoryService.GetFolderContent(userId, rootFolder.ID);
+            InventoryFolderBase objsFolder = null;
+            foreach (InventoryFolderBase folder in rootContents.Folders)
+                if (folder.Name == "Objects")
+                    objsFolder = folder;
             item1.Folder = objsFolder.ID;
             scene.AddInventoryItem(userId, item1);
 
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];