2 files changed, 46 insertions, 48 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 7902240..adf01b9 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -166,12 +166,12 @@ namespace OpenSim.Framework.Communications.Cache
             {            
                 foreach (InventoryFolderImpl folder in folders)
                 {
-                    FolderReceive(userID, folder);
+                    FolderReceive(folder);
                 }
                 
                 foreach (InventoryItemBase item in items)
                 {
-                    ItemReceive(userID, item);
+                    ItemReceive(item);
                 }
             }
             catch (Exception e)
@@ -198,56 +198,53 @@ namespace OpenSim.Framework.Communications.Cache
         /// </summary>
         /// <param name="userID"></param>
         /// <param name="folderInfo"></param>
-        private void FolderReceive(LLUUID userID, InventoryFolderImpl folderInfo)
+        private void FolderReceive(InventoryFolderImpl folderInfo)
         {
 //            m_log.DebugFormat(
 //                "[INVENTORY CACHE]: Received folder {0} {1} for user {2}", 
 //                folderInfo.Name, folderInfo.ID, userID);
-            
-            if (userID == UserProfile.ID)
+
+            if (RootFolder == null)
             {
-                if (RootFolder == null)
+                if (folderInfo.ParentID == LLUUID.Zero)
                 {
-                    if (folderInfo.ParentID == LLUUID.Zero)
-                    {
-                        m_rootFolder = folderInfo;
-                    }
+                    m_rootFolder = folderInfo;
                 }
-                else if (RootFolder.ID == folderInfo.ParentID)
+            }
+            else if (RootFolder.ID == folderInfo.ParentID)
+            {
+                lock (RootFolder.SubFolders)
                 {
-                    lock (RootFolder.SubFolders)
+                    if (!RootFolder.SubFolders.ContainsKey(folderInfo.ID))
                     {
-                        if (!RootFolder.SubFolders.ContainsKey(folderInfo.ID))
-                        {
-                            RootFolder.SubFolders.Add(folderInfo.ID, folderInfo);
-                        }
-                        else
-                        {
-                            AddPendingFolder(folderInfo);
-                        }      
+                        RootFolder.SubFolders.Add(folderInfo.ID, folderInfo);
                     }
+                    else
+                    {
+                        AddPendingFolder(folderInfo);
+                    }      
                 }
-                else
+            }
+            else
+            {
+                InventoryFolderImpl folder = RootFolder.GetDescendentFolder(folderInfo.ParentID);
+                lock (folder.SubFolders)
                 {
-                    InventoryFolderImpl folder = RootFolder.GetDescendentFolder(folderInfo.ParentID);
-                    lock (folder.SubFolders)
+                    if (folder != null)
                     {
-                        if (folder != null)
+                        if (!folder.SubFolders.ContainsKey(folderInfo.ID))
                         {
-                            if (!folder.SubFolders.ContainsKey(folderInfo.ID))
-                            {
-                                folder.SubFolders.Add(folderInfo.ID, folderInfo);
-                            }
-                        }
-                        else
-                        {
-                            AddPendingFolder(folderInfo);
+                            folder.SubFolders.Add(folderInfo.ID, folderInfo);
                         }
                     }
+                    else
+                    {
+                        AddPendingFolder(folderInfo);
+                    }
                 }
-                
-                ResolvePendingFolders(folderInfo);
             }
+            
+            ResolvePendingFolders(folderInfo);
         }
 
         /// <summary>
@@ -256,15 +253,14 @@ namespace OpenSim.Framework.Communications.Cache
         /// We're assuming here that items are always received after all the folders have been
         /// received.
         /// </summary>
-        /// <param name="userID"></param>
         /// <param name="folderInfo"></param>        
-        private void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
+        private void ItemReceive(InventoryItemBase itemInfo)
         {
 //            m_log.DebugFormat(
 //                "[INVENTORY CACHE]: Received item {0} {1} for user {2}", 
 //                itemInfo.Name, itemInfo.ID, userID);
             
-            if ((userID == UserProfile.ID) && (RootFolder != null))
+            if (RootFolder != null)
             {
                 if (itemInfo.Folder == RootFolder.ID)
                 {
@@ -305,14 +301,13 @@ namespace OpenSim.Framework.Communications.Cache
         /// <summary>
         /// Add an item to the user's inventory
         /// </summary>
-        /// <param name="userID"></param>
         /// <param name="itemInfo"></param>
         public void AddItem(LLUUID userID, InventoryItemBase itemInfo)
         {
-            if ((userID == UserProfile.ID) && HasInventory)
+            if (HasInventory)
             {
-                ItemReceive(userID, itemInfo);
-                m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
+                ItemReceive(itemInfo);
+                m_commsManager.InventoryService.AddItem(itemInfo);
             }
         }
 
@@ -325,7 +320,7 @@ namespace OpenSim.Framework.Communications.Cache
         {
             if ((userID == UserProfile.ID) && HasInventory)
             {
-                m_commsManager.InventoryService.UpdateInventoryItem(userID, itemInfo);
+                m_commsManager.InventoryService.UpdateItem(itemInfo);
             }
         }
 
@@ -343,7 +338,7 @@ namespace OpenSim.Framework.Communications.Cache
                 result = RootFolder.DeleteItem(item.ID);
                 if (result)
                 {
-                    m_commsManager.InventoryService.DeleteInventoryItem(userID, item);
+                    m_commsManager.InventoryService.DeleteItem(item);
                 }
             }
             
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 392d796..befb6c7 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -181,7 +181,8 @@ namespace OpenSim.Framework.Communications.Cache
                             createdBaseFolder.ParentID = createdFolder.ParentID;
                             createdBaseFolder.Type = createdFolder.Type;
                             createdBaseFolder.Version = createdFolder.Version;
-                            m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder);
+                            
+                            m_commsManager.InventoryService.AddFolder(createdBaseFolder);
                         }
                         else
                         {
@@ -207,7 +208,7 @@ namespace OpenSim.Framework.Communications.Cache
                                 createdBaseFolder.Type = createdFolder.Type;
                                 createdBaseFolder.Version = createdFolder.Version;                            
                                 
-                                m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder);
+                                m_commsManager.InventoryService.AddFolder(createdBaseFolder);
                             }
                             else
                             {
@@ -265,7 +266,8 @@ namespace OpenSim.Framework.Communications.Cache
                     baseFolder.ParentID = parentID;
                     baseFolder.Type = (short) type;
                     baseFolder.Version = userProfile.RootFolder.Version;
-                    m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, baseFolder);
+                    
+                    m_commsManager.InventoryService.AddFolder(baseFolder);
                 }
                 else
                 {
@@ -299,7 +301,8 @@ namespace OpenSim.Framework.Communications.Cache
                     baseFolder.Owner = remoteClient.AgentId;
                     baseFolder.ID = folderID;
                     baseFolder.ParentID = parentID;
-                    m_commsManager.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder);
+                    
+                    m_commsManager.InventoryService.MoveFolder(baseFolder);
                 }
                 else
                 {
@@ -544,7 +547,7 @@ namespace OpenSim.Framework.Communications.Cache
                         purgedBaseFolder.Type = purgedFolder.Type;
                         purgedBaseFolder.Version = purgedFolder.Version;                        
                         
-                        m_commsManager.InventoryService.PurgeInventoryFolder(remoteClient.AgentId, purgedBaseFolder);                                              
+                        m_commsManager.InventoryService.PurgeFolder(purgedBaseFolder);                                              
                         
                         purgedFolder.Purge();                        
                     }