From 31419a70ce05e7db0c54f4c4ec827a0d1fe23402 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 11 Aug 2009 10:30:03 -0700
Subject: System folders inventory cache added to OUT inventory modules. This
 tracks agents in and out of *sims* in order to fetch/drop their system
 folders from the cache. Also added region-side support for fetching the
 system folders from the inventory service. Nothing of this is called yet.

---
 .../Services/Connectors/Inventory/HGInventoryServiceConnector.cs    | 4 ++--
 .../Services/Connectors/Inventory/ISessionAuthInventoryService.cs   | 2 +-
 OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Services/Connectors/Inventory')

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index b168871..f6d1500 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Services.Connectors.Inventory
         /// <param name="userID"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public List<InventoryFolderBase> GetSystemFolders(string id, UUID sessionID)
+        public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string id, UUID sessionID)
         {
             m_log.Debug("[HGInventory]: GetSystemFolders " + id);
             string url = string.Empty;
@@ -138,7 +138,7 @@ namespace OpenSim.Services.Connectors.Inventory
                 return connector.GetSystemFolders(userID, sessionID);
             }
 
-            return new List<InventoryFolderBase>();
+            return new Dictionary<AssetType, InventoryFolderBase>();
         }
 
         /// <summary>
diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
index 98fd680..973cb0a 100644
--- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Services.Connectors
         /// <param name="userID"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        List<InventoryFolderBase> GetSystemFolders(string userID, UUID session_id);
+        Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID session_id);
 
         /// <summary>
         /// Gets everything (folders and items) inside a folder
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 1a6826e..3b15831 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -161,11 +161,11 @@ namespace OpenSim.Services.Connectors
         /// <param name="userID"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public List<InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID)
+        public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID)
         {
             try
             {
-                return SynchronousRestSessionObjectPoster<string, List<InventoryFolderBase>>.BeginPostObject(
+                return SynchronousRestSessionObjectPoster<string, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject(
                     "GET", m_ServerURI + "/SystemFolders/", userID, sessionID.ToString(), userID.ToString());
             }
             catch (Exception e)
@@ -174,7 +174,7 @@ namespace OpenSim.Services.Connectors
                      e.Source, e.Message);
             }
 
-            return new List<InventoryFolderBase>();
+            return new Dictionary<AssetType, InventoryFolderBase>();
         }
 
         /// <summary>
-- 
cgit v1.1