Merge branch 'master' of ssh://MyConnection/var/git/opensim

1 files changed, 43 insertions, 11 deletions

diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 65c2d96..19b1fd8 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -235,8 +235,6 @@ namespace OpenSim.Services.InventoryService
 
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
-            m_log.Info("[INVENTORY SERVICE]: Processing request for folder " + folderID);
-
             // Uncomment me to simulate a slow responding inventory server
             //Thread.Sleep(16000);
 
@@ -249,7 +247,7 @@ namespace OpenSim.Services.InventoryService
             invCollection.Folders = folders;
             invCollection.Items = items;
 
-            m_log.DebugFormat("[INVENTORY SERVICE]: Found {0} items and {1} folders", items.Count, folders.Count);
+            m_log.DebugFormat("[INVENTORY SERVICE]: Found {0} items and {1} folders in folder {2}", items.Count, folders.Count, folderID);
 
             return invCollection;            
         }
@@ -386,13 +384,33 @@ namespace OpenSim.Services.InventoryService
             return true;
         }
 
+        public virtual bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
+        {
+            m_log.InfoFormat(
+                "[INVENTORY SERVICE]: Moving {0} items from user {1}", items.Count, ownerID);
+
+            InventoryItemBase itm = null;
+            foreach (InventoryItemBase item in items)
+            {
+                itm = GetInventoryItem(item.ID);
+                itm.Folder = item.Folder;
+                if ((item.Name != null) && !item.Name.Equals(string.Empty))
+                    itm.Name = item.Name;
+                m_Database.updateInventoryItem(itm);
+            }
+
+            return true;
+        }
+
         // See IInventoryServices
-        public virtual bool DeleteItem(InventoryItemBase item)
+        public virtual bool DeleteItems(UUID owner, List<UUID> itemIDs)
         {
             m_log.InfoFormat(
-                "[INVENTORY SERVICE]: Deleting item {0} {1} from folder {2}", item.Name, item.ID, item.Folder);
+                "[INVENTORY SERVICE]: Deleting {0} items from user {1}", itemIDs.Count, owner);
 
-            m_Database.deleteInventoryItem(item.ID);
+            // uhh.....
+            foreach (UUID uuid in itemIDs)
+                m_Database.deleteInventoryItem(uuid);
 
             // FIXME: Should return false on failure
             return true;
@@ -400,22 +418,34 @@ namespace OpenSim.Services.InventoryService
 
         public virtual InventoryItemBase GetItem(InventoryItemBase item)
         {
-            InventoryItemBase result = m_Database.queryInventoryItem(item.ID);
+            InventoryItemBase result = m_Database.getInventoryItem(item.ID);
             if (result != null)
                 return result;
-
+            m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
             return null;
         }
 
-        public virtual InventoryFolderBase GetFolder(InventoryFolderBase item)
+        public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
-            InventoryFolderBase result = m_Database.queryInventoryFolder(item.ID);
+            InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
             if (result != null)
                 return result;
 
+            m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
             return null;
         }
 
+        public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
+        {
+            foreach (UUID id in folderIDs)
+            {
+                InventoryFolderBase folder = new InventoryFolderBase(id, ownerID);
+                PurgeFolder(folder);
+                m_Database.deleteInventoryFolder(id);
+            }
+            return true;
+        }
+
         /// <summary>
         /// Purge a folder of all items items and subfolders.
         ///
@@ -439,10 +469,12 @@ namespace OpenSim.Services.InventoryService
 
             List<InventoryItemBase> items = GetFolderItems(folder.Owner, folder.ID);
 
+            List<UUID> uuids = new List<UUID>();
             foreach (InventoryItemBase item in items)
             {
-                DeleteItem(item);
+                uuids.Add(item.ID);
             }
+            DeleteItems(folder.Owner, uuids);
 
             // FIXME: Should return false on failure
             return true;