* Add DeleteAllContents() method to InventoryFolderImpl - not yet used but will be soon

* Add locking to InventoryFolderImpl class - need more though.

OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs

@@ -57,8 +57,9 @@ namespace OpenSim.Framework.Communications.Cache
         {
         }
 
-        // Methods
         public InventoryFolderImpl CreateNewSubFolder(LLUUID folderID, string folderName, ushort type)
+        {
+            lock (SubFolders)
             {
                 if (!SubFolders.ContainsKey(folderID))
                 {
@@ -71,16 +72,46 @@ namespace OpenSim.Framework.Communications.Cache
                     SubFolders.Add(subFold.ID, subFold);
                     return subFold;
                 }
+            }
+            
             return null;
         }
         
+        /// <summary>
+        /// Delete all the folders and items in this folder.
+        /// 
+        /// TODO: This method is not used yet, but will be shortly
+        /// </summary>
+        public void DeleteAllContents()
+        {
+            foreach (InventoryFolderImpl folder in SubFolders.Values)
+            {
+                folder.DeleteAllContents();                
+            }
+            
+            SubFolders.Clear();
+            Items.Clear();
+        }
+
+        /// <summary>
+        /// Does this folder contain the given item?
+        /// </summary>
+        /// <param name="itemID"></param>
+        /// <returns></returns>
         public InventoryItemBase HasItem(LLUUID itemID)
         {
             InventoryItemBase base2 = null;
+            
+            lock (Items)
+            {
                 if (Items.ContainsKey(itemID))
                 {
                     return Items[itemID];
                 }
+            }
+            
+            lock (SubFolders)
+            {
                 foreach (InventoryFolderImpl folder in SubFolders.Values)
                 {
                     base2 = folder.HasItem(itemID);
@@ -89,17 +120,31 @@ namespace OpenSim.Framework.Communications.Cache
                         break;
                     }
                 }
+            }
+            
             return base2;
         }
 
+        /// <summary>
+        /// Delete an item from the folder.
+        /// </summary>
+        /// <param name="folderID"></param>
+        /// <returns></returns>
         public bool DeleteItem(LLUUID itemID)
         {
             bool found = false;
+            
+            lock (Items)
+            {
                 if (Items.ContainsKey(itemID))
                 {
                     Items.Remove(itemID);
                     return true;
                 }
+            }
+            
+            lock (SubFolders)
+            {
                 foreach (InventoryFolderImpl folder in SubFolders.Values)
                 {
                     found = folder.DeleteItem(itemID);
@@ -108,13 +153,20 @@ namespace OpenSim.Framework.Communications.Cache
                         break;
                     }
                 }
+            }
             return found;
         }
 
-
+        /// <summary>
+        /// Does this folder contain the given subfolder?
+        /// </summary>
+        /// <returns></returns>
         public InventoryFolderImpl HasSubFolder(LLUUID folderID)
         {            
             InventoryFolderImpl returnFolder = null;
+            
+            lock (SubFolders)
+            {
                 if (SubFolders.ContainsKey(folderID))
                 {
                     returnFolder = SubFolders[folderID];
@@ -130,26 +182,44 @@ namespace OpenSim.Framework.Communications.Cache
                         }
                     }
                 }
+            }
+            
             return returnFolder;
         }
 
+        /// <summary>
+        /// Return the list of items in this folder
+        /// </summary>
         public List<InventoryItemBase> RequestListOfItems()
         {
             List<InventoryItemBase> itemList = new List<InventoryItemBase>();
+                
+            lock (Items)
+            {
                 foreach (InventoryItemBase item in Items.Values)
                 {
                     itemList.Add(item);
                 }
+            }
+            
             return itemList;
         }
 
+        /// <summary>
+        /// Return the list of folders in this folder
+        /// </summary>
         public List<InventoryFolderBase> RequestListOfFolders()
         {            
             List<InventoryFolderBase> folderList = new List<InventoryFolderBase>();
+            
+            lock (SubFolders)
+            {
                 foreach (InventoryFolderBase folder in SubFolders.Values)
                 {
                     folderList.Add(folder);
                 }
+            }
+            
             return folderList;
         }
     }