3 files changed, 43 insertions, 37 deletions

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index fe663eb..88a905c 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Services.AssetService
             if (!UUID.TryParse(id, out assetID))
                 return null;
 
-            return m_Database.FetchAsset(assetID);
+            return m_Database.GetAsset(assetID);
         }
 
         public AssetMetadata GetMetadata(string id)
@@ -93,7 +93,7 @@ namespace OpenSim.Services.AssetService
             if (!UUID.TryParse(id, out assetID))
                 return null;
 
-            AssetBase asset = m_Database.FetchAsset(assetID);
+            AssetBase asset = m_Database.GetAsset(assetID);
             return asset.Metadata;
         }
 
@@ -104,7 +104,7 @@ namespace OpenSim.Services.AssetService
             if (!UUID.TryParse(id, out assetID))
                 return null;
 
-            AssetBase asset = m_Database.FetchAsset(assetID);
+            AssetBase asset = m_Database.GetAsset(assetID);
             return asset.Data;
         }
 
@@ -117,7 +117,7 @@ namespace OpenSim.Services.AssetService
             if (!UUID.TryParse(id, out assetID))
                 return false;
 
-            AssetBase asset = m_Database.FetchAsset(assetID);
+            AssetBase asset = m_Database.GetAsset(assetID);
 
             //m_log.DebugFormat("[AssetService]: Got asset {0}", asset);
             
@@ -129,7 +129,7 @@ namespace OpenSim.Services.AssetService
         public string Store(AssetBase asset)
         {
             //m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID);
-            m_Database.CreateAsset(asset);
+            m_Database.StoreAsset(asset);
 
             return asset.ID;
         }
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)
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index e0217f6..6310254 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -420,16 +420,16 @@ 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)
         {
-            InventoryFolderBase result = m_Database.queryInventoryFolder(item.ID);
+            InventoryFolderBase result = m_Database.getInventoryFolder(item.ID);
             if (result != null)
                 return result;