From e5f33e75055a8f83cf4e11a6120774cb90dbc3be Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 18 Aug 2009 22:36:03 -0700
Subject: GetFolderItems implemented. It's not being called, but it might.

---
 .../Connectors/Inventory/HGInventoryServiceConnector.cs | 13 +++++++++++++
 .../Inventory/ISessionAuthInventoryService.cs           |  7 +++++++
 .../Connectors/Inventory/InventoryServiceConnector.cs   | 17 +++++++++++++++++
 3 files changed, 37 insertions(+)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 94b4ad9..75fa516 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -214,6 +214,19 @@ namespace OpenSim.Services.Connectors.Inventory
             return false;
         }
 
+        public List<InventoryItemBase> GetFolderItems(string id, UUID folderID, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.GetFolderItems(userID, folderID, sessionID);
+            }
+            return new List<InventoryItemBase>();
+        }
+        
         public bool AddItem(string id, InventoryItemBase item, UUID sessionID)
         {
             string url = string.Empty;
diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
index f50bcf5..7f051f3 100644
--- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
@@ -96,6 +96,13 @@ namespace OpenSim.Services.Connectors
         bool PurgeFolder(string userID, InventoryFolderBase folder, UUID session_id);
 
         /// <summary>
+        /// Get items from a folder.
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully purged</returns>
+        List<InventoryItemBase> GetFolderItems(string userID, UUID folderID, UUID session_id);
+
+        /// <summary>
         /// Add a new item to the user's inventory
         /// </summary>
         /// <param name="item"></param>
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 5d94eac..5aa4b30 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -334,6 +334,23 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        public List<InventoryItemBase> GetFolderItems(string userID, UUID folderID, UUID sessionID)
+        {
+            try
+            {
+                InventoryFolderBase folder = new InventoryFolderBase(folderID, new UUID(userID));
+                return SynchronousRestSessionObjectPoster<InventoryFolderBase, List<InventoryItemBase>>.BeginPostObject(
+                    "POST", m_ServerURI + "/GetItems/", folder, sessionID.ToString(), userID);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: Get folder items operation failed, {0} {1}",
+                     e.Source, e.Message);
+            }
+
+            return null;
+        }
+
         public bool AddItem(string userID, InventoryItemBase item, UUID sessionID)
         {
             try
-- 
cgit v1.1


From c5af39239f7f2a1725d9c08bea80522de8835e0f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 19 Aug 2009 00:13:51 -0700
Subject: A better purge of trash folder.

---
 .../Services/Connectors/Inventory/HGInventoryServiceConnector.cs | 4 ++--
 .../Connectors/Inventory/ISessionAuthInventoryService.cs         | 2 +-
 .../Services/Connectors/Inventory/InventoryServiceConnector.cs   | 9 ++++++---
 .../Inventory/QuickAndDirtyInventoryServiceConnector.cs          | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 75fa516..00b74b5 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -253,7 +253,7 @@ namespace OpenSim.Services.Connectors.Inventory
             return false;
         }
 
-        public bool DeleteItem(string id, InventoryItemBase item, UUID sessionID)
+        public bool DeleteItems(string id, List<UUID> itemIDs, UUID sessionID)
         {
             string url = string.Empty;
             string userID = string.Empty;
@@ -261,7 +261,7 @@ namespace OpenSim.Services.Connectors.Inventory
             if (StringToUrlAndUserID(id, out url, out userID))
             {
                 ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.UpdateItem(userID, item, sessionID);
+                return connector.DeleteItems(userID, itemIDs, sessionID);
             }
             return false;
         }
diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
index 7f051f3..e4e713c 100644
--- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Services.Connectors
         /// </summary>
         /// <param name="item"></param>
         /// <returns>true if the item was successfully deleted</returns>
-        bool DeleteItem(string userID, InventoryItemBase item, UUID session_id);
+        bool DeleteItems(string userID, List<UUID> itemIDs, UUID session_id);
 
         InventoryItemBase QueryItem(string userID, InventoryItemBase item, UUID session_id);
 
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 5aa4b30..9b2e331 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -383,12 +383,15 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
-        public bool DeleteItem(string userID, InventoryItemBase item, UUID sessionID)
+        public bool DeleteItems(string userID, List<UUID> items, UUID sessionID)
         {
             try
             {
-                return SynchronousRestSessionObjectPoster<InventoryItemBase, bool>.BeginPostObject(
-                    "POST", m_ServerURI + "/DeleteItem/", item, sessionID.ToString(), item.Owner.ToString());
+                List<Guid> guids = new List<Guid>();
+                foreach (UUID u in items)
+                    guids.Add(u.Guid);
+                return SynchronousRestSessionObjectPoster<List<Guid>, bool>.BeginPostObject(
+                    "POST", m_ServerURI + "/DeleteItem/", guids, sessionID.ToString(), userID);
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
index 5cbd307..3bbf129 100644
--- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
-        public bool DeleteItem(InventoryItemBase item)
+        public bool DeleteItems(UUID owner, List<UUID> itemIDs)
         {
             return false;
         }
-- 
cgit v1.1


From d519f1885f587409592cf92bc0f4ba8533a1866f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 19 Aug 2009 10:56:08 -0700
Subject: Added MoveItems, which is most useful upon viewer-delete inventory
 operation. Moving a batch of items is a 1-time operation. Made it async
 anyway, so that the viewer doesn't wait in case the DB layer is dumb (which
 is the case currently).

---
 .../Inventory/HGInventoryServiceConnector.cs       | 13 +++++++
 .../Inventory/ISessionAuthInventoryService.cs      |  2 ++
 .../Inventory/InventoryServiceConnector.cs         | 42 ++++++++++++++++++++++
 .../QuickAndDirtyInventoryServiceConnector.cs      |  5 +++
 4 files changed, 62 insertions(+)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 00b74b5..45e921a 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -253,6 +253,19 @@ namespace OpenSim.Services.Connectors.Inventory
             return false;
         }
 
+        public bool MoveItems(string id, List<InventoryItemBase> items, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.MoveItems(userID, items, sessionID);
+            }
+            return false;
+        }
+
         public bool DeleteItems(string id, List<UUID> itemIDs, UUID sessionID)
         {
             string url = string.Empty;
diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
index e4e713c..c89c9b7 100644
--- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
@@ -116,6 +116,8 @@ namespace OpenSim.Services.Connectors
         /// <returns>true if the item was successfully updated</returns>
         bool UpdateItem(string userID, InventoryItemBase item, UUID session_id);
 
+        bool MoveItems(string userID, List<InventoryItemBase> items, UUID session_id);
+        
         /// <summary>
         /// Delete an item from the user's inventory
         /// </summary>
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 9b2e331..bcf9d87 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -383,6 +383,48 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        /**
+         * MoveItems Async group
+         */
+
+        delegate void MoveItemsDelegate(string userID, List<InventoryItemBase> items, UUID sessionID);
+
+        private void MoveItemsAsync(string userID, List<InventoryItemBase> items, UUID sessionID)
+        {
+            try
+            {
+                SynchronousRestSessionObjectPoster<List<InventoryItemBase>, bool>.BeginPostObject(
+                    "POST", m_ServerURI + "/MoveItems/", items, sessionID.ToString(), userID.ToString());
+
+                // Success
+                return;
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory items operation failed, {0} {1} (old server?). Trying slow way.",
+                     e.Source, e.Message);
+            }
+
+            foreach (InventoryItemBase item in items)
+            {
+                InventoryItemBase itm = this.QueryItem(userID, item, sessionID);
+                itm.Name = item.Name;
+                itm.Folder = item.Folder;
+                this.UpdateItem(userID, itm, sessionID);
+            }
+        }
+
+        private void MoveItemsCompleted(IAsyncResult iar)
+        {
+        }
+
+        public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID)
+        {
+            MoveItemsDelegate d = MoveItemsAsync;
+            d.BeginInvoke(userID, items, sessionID, MoveItemsCompleted, d);
+            return true;
+        }
+
         public bool DeleteItems(string userID, List<UUID> items, UUID sessionID)
         {
             try
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
index 3bbf129..cd283ff 100644
--- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
@@ -151,6 +151,11 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
+        {
+            return false;
+        }
+
         public bool DeleteItems(UUID owner, List<UUID> itemIDs)
         {
             return false;
-- 
cgit v1.1


From 51e487a172d97d17e3a02f8f3479af24a1d1ae41 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 19 Aug 2009 12:02:57 -0700
Subject: Makes the inventory connectors fully compatible with the old
 Grid.InventoryServer. WARNING: interacting with the old server is _much_
 slower than interacting with the new one. Grids with the old server will not
 see any improvements on crossings and TPs, because inventory needs to be
 fetched from it in its entirety.

---
 .../Inventory/InventoryServiceConnector.cs         | 64 ++++++++++++----------
 1 file changed, 35 insertions(+), 29 deletions(-)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index bcf9d87..b573a06 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -178,30 +178,36 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 // Maybe we're talking to an old inventory server. Try this other thing.
-                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}. Trying RootFolders.",
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1} (old sever?). Trying GetInventory.",
                      e.Source, e.Message);
 
                 try
                 {
-                    folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject(
-                        "POST", m_ServerURI + "/RootFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
+                    InventoryCollection inventory = SynchronousRestSessionObjectPoster<Guid, InventoryCollection>.BeginPostObject(
+                        "POST", m_ServerURI + "/GetInventory/", new Guid(userID), sessionID.ToString(), userID.ToString());
+                    folders = inventory.Folders;
                 }
                 catch (Exception ex)
                 {
-                    m_log.ErrorFormat("[INVENTORY CONNECTOR]: RootFolders operation also failed, {0} {1}. Give up.",
+                    m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetInventory operation also failed, {0} {1}. Giving up.",
                          e.Source, ex.Message);
                 }
 
                 if ((folders != null) && (folders.Count > 0))
                 {
-                    dFolders[AssetType.Folder] = folders[0]; // Root folder is the first one
-                    folders.RemoveAt(0);
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: Received entire inventory ({0} folders) for user {1}",
+                        folders.Count, userID);
                     foreach (InventoryFolderBase f in folders)
                     {
                         if ((f.Type != (short)AssetType.Folder) && (f.Type != (short)AssetType.Unknown))
                         dFolders[(AssetType)f.Type] = f;
                     }
 
+                    UUID rootFolderID = dFolders[AssetType.Animation].ParentID;
+                    InventoryFolderBase rootFolder = new InventoryFolderBase(rootFolderID, new UUID(userID));
+                    rootFolder = QueryFolder(userID, rootFolder, sessionID);
+                    dFolders[AssetType.Folder] = rootFolder;
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: {0} system folders for user {1}", dFolders.Count, userID);
                     return dFolders;
                 }
             }
@@ -226,48 +232,48 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 // Maybe we're talking to an old inventory server. Try this other thing.
-                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderForType operation failed, {0} {1}. Trying RootFolders and GetItems.",
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1} (old server?). Trying GetInventory.",
                      e.Source, e.Message);
 
+                InventoryCollection inventory;
                 List<InventoryFolderBase> folders = null;
                 try
                 {
-                    folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject(
-                        "POST", m_ServerURI + "/RootFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
+                    inventory = SynchronousRestSessionObjectPoster<Guid, InventoryCollection>.BeginPostObject(
+                        "POST", m_ServerURI + "/GetInventory/", new Guid(userID), sessionID.ToString(), userID.ToString());
+                    if (inventory != null)
+                        folders = inventory.Folders;
                 }
                 catch (Exception ex)
                 {
-                    m_log.ErrorFormat("[INVENTORY CONNECTOR]: RootFolders operation also failed, {0} {1}. Give up.",
+                    m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetInventory operation also failed, {0} {1}. Giving up.",
                          e.Source, ex.Message);
+                    return new InventoryCollection();
                 }
 
                 if ((folders != null) && (folders.Count > 0))
                 {
-                    folders = folders.FindAll(delegate (InventoryFolderBase f) { return f.ParentID == folderID ; });
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: Received entire inventory ({0} folders) for user {1}",
+                        folders.Count, userID);
 
-                    try
+                    folders = folders.FindAll(delegate(InventoryFolderBase f) { return f.ParentID == folderID; });
+                    List<InventoryItemBase> items = inventory.Items;
+                    if (items != null)
                     {
-                        List<InventoryItemBase> items = SynchronousRestSessionObjectPoster<Guid, List<InventoryItemBase>>.BeginPostObject(
-                                        "POST", m_ServerURI + "/GetItems/", folderID.Guid, sessionID.ToString(), userID.ToString());
-
-                        if (items != null)
-                        {
-                            InventoryCollection result = new InventoryCollection();
-                            result.Folders = folders;
-                            result.Items = items;
-                            result.UserID = new UUID(userID);
-                            return result;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        m_log.ErrorFormat("[INVENTORY CONNECTOR]: QueryFolder and GetItems operation failed, {0} {1}. Give up.",
-                             e.Source, ex.Message);
+                        items = items.FindAll(delegate(InventoryItemBase i) { return i.Folder == folderID; });
                     }
+
+                    inventory.Items = items;
+                    inventory.Folders = folders;
+                    return inventory;
                 }
             }
 
-            return null;
+            InventoryCollection nullCollection = new InventoryCollection();
+            nullCollection.Folders = new List<InventoryFolderBase>();
+            nullCollection.Items = new List<InventoryItemBase>();
+            nullCollection.UserID = new UUID(userID);
+            return nullCollection;
         }
 
         public bool AddFolder(string userID, InventoryFolderBase folder, UUID sessionID)
-- 
cgit v1.1


From 33186527235091f95a7251ea66a713fdaee1c689 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 21 Aug 2009 11:00:45 -0700
Subject: Added a more sane InventoryServerMoveItemsHandler. Changed
 SynchronousRestObjectRequester so that it also understands PUTs.

---
 .../Inventory/InventoryServiceConnector.cs          | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index b573a06..7c35bde 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -397,13 +397,28 @@ namespace OpenSim.Services.Connectors
 
         private void MoveItemsAsync(string userID, List<InventoryItemBase> items, UUID sessionID)
         {
+            if (items == null)
+            {
+                m_log.WarnFormat("[INVENTORY CONNECTOR]: request to move items got a null list.");
+                return;
+            }
+
             try
             {
-                SynchronousRestSessionObjectPoster<List<InventoryItemBase>, bool>.BeginPostObject(
-                    "POST", m_ServerURI + "/MoveItems/", items, sessionID.ToString(), userID.ToString());
+                //SynchronousRestSessionObjectPoster<List<InventoryItemBase>, bool>.BeginPostObject(
+                //    "POST", m_ServerURI + "/MoveItems/", items, sessionID.ToString(), userID.ToString());
+
+                //// Success
+                //return;
+                string uri = m_ServerURI + "/inventory/" + userID;
+                if (SynchronousRestObjectRequester.
+                        MakeRequest<List<InventoryItemBase>, bool>("PUT", uri, items))
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: move {0} items poster succeeded {1}", items.Count, uri);
+                else
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: move {0} items poster failed {1}", items.Count, uri); ;
 
-                // Success
                 return;
+
             }
             catch (Exception e)
             {
-- 
cgit v1.1


From b03eeeb9f6331ed36c61f55aef847ce3b2db7ba4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 22 Aug 2009 10:24:26 -0700
Subject: * Fixes mantis http://opensimulator.org/mantis/view.php?id=4044.
 Turns out folders were never being removed from trash when they were singled
 out for purging in trash. They were being removed when Trash was purged as a
 whole. That behavior is now fixed for the new InventoryService set. * Removed
 left-overs from AssetInventoryServer.

---
 .../Inventory/HGInventoryServiceConnector.cs       | 13 ++++++++++++
 .../Inventory/ISessionAuthInventoryService.cs      |  5 +++++
 .../Inventory/InventoryServiceConnector.cs         | 23 ++++++++++++++++++++--
 .../QuickAndDirtyInventoryServiceConnector.cs      |  6 ++++++
 4 files changed, 45 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 45e921a..1004fb9 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -201,6 +201,19 @@ namespace OpenSim.Services.Connectors.Inventory
             return false;
         }
 
+        public bool DeleteFolders(string id, List<UUID> folders, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.DeleteFolders(userID, folders, sessionID);
+            }
+            return false;
+        }
+
         public bool PurgeFolder(string id, InventoryFolderBase folder, UUID sessionID)
         {
             string url = string.Empty;
diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
index c89c9b7..da8c7e2 100644
--- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
@@ -89,6 +89,11 @@ namespace OpenSim.Services.Connectors
         bool MoveFolder(string userID, InventoryFolderBase folder, UUID session_id);
 
         /// <summary>
+        /// Delete a list of inventory folders (from trash)
+        /// </summary>
+        bool DeleteFolders(string userID, List<UUID> folders, UUID session_id);
+
+        /// <summary>
         /// Purge an inventory folder of all its items and subfolders.
         /// </summary>
         /// <param name="folder"></param>
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 7c35bde..423ca75 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -308,6 +308,25 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        public bool DeleteFolders(string userID, List<UUID> folderIDs, UUID sessionID)
+        {
+            try
+            {
+                List<Guid> guids = new List<Guid>();
+                foreach (UUID u in folderIDs)
+                    guids.Add(u.Guid);
+                return SynchronousRestSessionObjectPoster<List<Guid>, bool>.BeginPostObject(
+                    "POST", m_ServerURI + "/DeleteFolders/", guids, sessionID.ToString(), userID);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory folders operation failed, {0} {1}",
+                     e.Source, e.Message);
+            }
+
+            return false;
+        }
+
         public bool MoveFolder(string userID, InventoryFolderBase folder, UUID sessionID)
         {
             try
@@ -481,12 +500,12 @@ namespace OpenSim.Services.Connectors
             return null;
         }
 
-        public InventoryFolderBase QueryFolder(string userID, InventoryFolderBase item, UUID sessionID)
+        public InventoryFolderBase QueryFolder(string userID, InventoryFolderBase folder, UUID sessionID)
         {
             try
             {
                 return SynchronousRestSessionObjectPoster<InventoryFolderBase, InventoryFolderBase>.BeginPostObject(
-                    "POST", m_ServerURI + "/QueryFolder/", item, sessionID.ToString(), item.Owner.ToString());
+                    "POST", m_ServerURI + "/QueryFolder/", folder, sessionID.ToString(), userID);
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
index cd283ff..a7aa138 100644
--- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
@@ -136,6 +136,12 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        public bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
+        {
+            return false;
+        }
+
+
         public bool PurgeFolder(InventoryFolderBase folder)
         {
             return false;
-- 
cgit v1.1


From cfd9cf7b18331a9d2117294f6ba23dd03a9423a1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 25 Aug 2009 06:17:36 -0700
Subject: Closed the web request and stream in
 SynchronousRestSessionObjectPoster -- maybe this is the cause of some
 timeouts seen in some monos?

---
 OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 423ca75..a2261ba 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -229,6 +229,11 @@ namespace OpenSim.Services.Connectors
                 return SynchronousRestSessionObjectPoster<Guid, InventoryCollection>.BeginPostObject(
                     "POST", m_ServerURI + "/GetFolderContent/", folderID.Guid, sessionID.ToString(), userID.ToString());
             }
+            catch (TimeoutException e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation to {0} timed out {0} {1}.", m_ServerURI,
+                     e.Source, e.Message);
+            }
             catch (Exception e)
             {
                 // Maybe we're talking to an old inventory server. Try this other thing.
-- 
cgit v1.1