Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.

1 files changed, 7 insertions, 9 deletions

diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 7b2948f..80c2e64 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -1,31 +1,29 @@
 using System;
-using System.Text;
 using System.Collections.Generic;
-
-using libsecondlife;
+using System.Text;
 using OpenSim.Framework.Data;
+using libsecondlife;
 using OpenSim.Framework.Communications.Caches;
+using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
 
 namespace OpenSim.Framework.Communications
 {
-    public delegate void InventoryFolderInfo(LLUUID userID, InventoryFolderBase folderInfo);
+    public delegate void InventoryFolderInfo(LLUUID userID, InventoryFolder folderInfo);
     public delegate void InventoryItemInfo(LLUUID userID, InventoryItemBase itemInfo);
 
     public interface IInventoryServices
     {
         void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack);
-        void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder);
+        void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder);
         void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
         void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
-        void CreateNewUserInventory(LLUUID libraryRootId, LLUUID user);
-        void GetRootFoldersForUser(LLUUID user, out LLUUID libraryFolder, out LLUUID personalFolder);
+        void CreateNewUserInventory(LLUUID user);
 
         /// <summary>
         /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
         /// </summary>
         /// <param name="userID"></param>
         /// <returns></returns>
-        List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID folderID);
-        List<InventoryItemBase> RequestFolderItems(LLUUID folderID);
+        List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID);
     }
 }