diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 3aed301ea8..dbcb9bd282 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -637,7 +637,7 @@ namespace OpenSim.Data.MySQL
         }
 
         /// <summary>
-        /// Delete an inventory folder
+        /// Deletes an inventory folder
         /// </summary>
         /// <param name="folderId">Id of folder to delete</param>
         public void deleteInventoryFolder(LLUUID folderID)
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index daf9ab5584..781249937c 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -79,14 +79,12 @@ namespace OpenSim.Framework.Communications.Cache
         
         /// <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()
+        public void Purge()
         {
             foreach (InventoryFolderImpl folder in SubFolders.Values)
             {
-                folder.DeleteAllContents();                
+                folder.Purge();                
             }
             
             SubFolders.Clear();
@@ -206,7 +204,7 @@ namespace OpenSim.Framework.Communications.Cache
         }
 
         /// <summary>
-        /// Return the list of folders in this folder
+        /// Return the list of immediate child folders in this folder.
         /// </summary>
         public List<InventoryFolderBase> RequestListOfFolders()
         {            
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index e3f68150e8..61ec4839dd 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -496,6 +496,11 @@ namespace OpenSim.Framework.Communications.Cache
             return new List<InventoryItemBase>();
         }
 
+        /// <summary>
+        /// This should delete all the items and folders in the given directory.
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="folderID"></param>
         public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID)
         {
 //            m_log.InfoFormat("[AGENT INVENTORY]: Purging folder {0} for {1} uuid {2}", 
@@ -506,14 +511,28 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 if (userProfile.HasInventory)
                 {
-                    InventoryFolderImpl subFolder = userProfile.RootFolder.HasSubFolder(folderID);
-                    if (subFolder != null)
-                    {
-                        List<InventoryItemBase> items = subFolder.RequestListOfItems();
+                    InventoryFolderImpl purgedFolder = userProfile.RootFolder.HasSubFolder(folderID);
+                    if (purgedFolder != null)
+                    {                        
+                        // XXX Nasty - have to create a new object to hold details we already have
+                        InventoryFolderBase purgedBaseFolder = new InventoryFolderBase();
+                        purgedBaseFolder.Owner = purgedFolder.Owner;
+                        purgedBaseFolder.ID = purgedFolder.ID;
+                        purgedBaseFolder.Name = purgedFolder.Name;
+                        purgedBaseFolder.ParentID = purgedFolder.ParentID;
+                        purgedBaseFolder.Type = purgedFolder.Type;
+                        purgedBaseFolder.Version = purgedFolder.Version;                        
+                        
+                        m_commsManager.InventoryService.PurgeInventoryFolder(remoteClient.AgentId, purgedBaseFolder);                        
+
+                        // XXX Remains temporarily so that we still delete items in the grid case.
+                        List<InventoryItemBase> items = purgedFolder.RequestListOfItems();
                         foreach (InventoryItemBase item in items)
                         {
                             userProfile.DeleteItem(remoteClient.AgentId, item);
-                        }
+                        }                        
+                        
+                        purgedFolder.Purge();                        
                     }
                 }
                 else
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 90bda0159d..5690f892b6 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -56,8 +56,20 @@ namespace OpenSim.Framework.Communications
         /// <param name="folder"></param>
         void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder);
         
+        /// <summary>
+        /// Move an inventory folder to a new location
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folder">A folder containing the details of the new location</param>
         void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder);
         
+        /// <summary>
+        /// Purge an inventory folder of all its items and subfolders.
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folder"></param>
+        void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder);
+        
         /// <summary>
         /// Add a new item to the given user's inventory
         /// </summary>
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index f614e7dc8c..769c53088f 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Communications
         {
             if (!String.IsNullOrEmpty(FileName))
             {
-                m_log.Info("[AGENTINVENTORY]: Inventory storage: Attempting to load " + FileName);
+                m_log.Info("[AGENT INVENTORY]: Inventory storage: Attempting to load " + FileName);
                 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
 
                 foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -161,9 +161,19 @@ namespace OpenSim.Framework.Communications
         // See IInventoryServices
         public abstract void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback);
         
+        // See IInventoryServices
         public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder);
+        
+        // See IInventoryServices
         public abstract void MoveExistingInventoryFolder(InventoryFolderBase folder);
+        
+        // See IInventoryServices
+        public abstract void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder);
+        
+        // See IInventoryServices
         public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
+        
+        // See IInventoryServices
         public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);        
         
         #endregion
@@ -228,6 +238,36 @@ namespace OpenSim.Framework.Communications
             }
         }
         
+        /// <summary>
+        /// Purge a folder of all items items and subfolders.
+        /// 
+        /// FIXME: Really nasty in a sense, because we have to query the database to get information we may
+        /// already know...  Needs heavy refactoring.
+        /// </summary>
+        /// <param name="folder"></param>
+        protected void PurgeFolder(InventoryFolderBase folder)
+        {
+            List<InventoryFolderBase> subFolders = RequestSubFolders(folder.ID);
+            
+            foreach (InventoryFolderBase subFolder in subFolders)
+            {
+//                m_log.DebugFormat("[AGENT INVENTORY]: Deleting folder {0} {1}", subFolder.Name, subFolder.ID);
+                
+                foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
+                {
+                    plugin.Value.deleteInventoryFolder(subFolder.ID);
+                }
+            }
+
+            // XXX Temporarily don't delete the items since UserProfileCacheService is still doing this
+//            List<InventoryItemBase> items = RequestFolderItems(folder.ID);
+//
+//            foreach (InventoryItemBase item : items)
+//            {
+//                DeleteItem(item);
+//            }
+        }
+        
         private void AddNewInventorySet(UsersInventory inventory)
         {
             foreach (InventoryFolderBase folder in inventory.Folders.Values)
@@ -236,6 +276,9 @@ namespace OpenSim.Framework.Communications
             }
         }
 
+        /// <summary>
+        /// Used to create a new user inventory.
+        /// </summary>
         private class UsersInventory
         {
             public Dictionary<LLUUID, InventoryFolderBase> Folders = new Dictionary<LLUUID, InventoryFolderBase>();
diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs
index 6a500f8a92..d72231de70 100644
--- a/OpenSim/Framework/IInventoryData.cs
+++ b/OpenSim/Framework/IInventoryData.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Framework
         void moveInventoryFolder(InventoryFolderBase folder);
 
         /// <summary>
-        /// Deletes a folder based on its ID with folder
+        /// Deletes a folder.  Thie will delete both the folder itself and its contents (items and descendent folders)
         /// </summary>
         /// <param name="folder">The id of the folder</param>
         void deleteInventoryFolder(LLUUID folder);
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 8c8d85880d..6ed2961be4 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -108,8 +108,6 @@ namespace OpenSim.Framework
         	}
         }
 
-
-
         public int InvType {
         	get {
         		return _invType;
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index fe892ca628..016ecffef1 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -220,6 +220,16 @@ namespace OpenSim.Grid.InventoryServer
             MoveExistingInventoryFolder(folder);
             return true;
         }
+        
+        /// <summary>
+        /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folder"></param>
+        public override void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder)
+        {
+            // XXX No implementation yet (temporarily)!
+        }         
 
         public bool AddInventoryItem(InventoryItemBase item)
         {
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index a567eeb06e..175829b689 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -100,6 +100,16 @@ namespace OpenSim.Region.Communications.Local
             DeleteItem(item);
         }
 
+        /// <summary>
+        /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folder"></param>
+        public override void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder)      
+        {
+            PurgeFolder(folder);
+        }
+
         public override bool HasInventoryForUser(LLUUID userID)
         {
             InventoryFolderBase root = RequestRootFolder(userID);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index e0167a709d..8c27cb1494 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -175,6 +175,16 @@ namespace OpenSim.Region.Communications.OGS1
                      e.Source, e.Message);
             }                
         }
+        
+        /// <summary>
+        /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folder"></param>
+        public void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder)
+        {
+            // XXX No implementation yet (temporarily)!
+        }        
 
         public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
         {