Added more functions to IInventoryService. Unsure about whether all of these are really necessary.

3 files changed, 83 insertions, 0 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs
index f4cd269..3a0011f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs
@@ -159,6 +159,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
 
         #region IInventoryService
 
+        public bool CreateUserInventory(UUID userID)
+        {
+            if (IsLocalGridUser(userID))
+                return m_GridService.CreateUserInventory(userID);
+            else
+                return false;
+        }
+
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        {
+            return new List<InventoryFolderBase>();
+        }
+
+        public InventoryCollection GetUserInventory(UUID userID)
+        {
+            if (IsLocalGridUser(userID))
+                return m_GridService.GetUserInventory(userID);
+            else
+                return null;
+        }
+
         public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
         {
             if (IsLocalGridUser(userID))
@@ -171,6 +192,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
             }
         }
 
+        public List<InventoryItemBase> GetFolderItems(UUID folderID)
+        {
+            return new List<InventoryItemBase>();
+        }
+
         public bool AddFolder(InventoryFolderBase folder)
         {
             if (folder == null)
@@ -316,6 +342,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
             return null;
         }
 
+        public List<InventoryItemBase> GetActiveGestures(UUID userId)
+        {
+            return new List<InventoryItemBase>();
+        }
+
         #endregion
 
         private UUID GetSessionID(UUID userID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
index 3db08eb..c89f295 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
@@ -137,11 +137,33 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
 

         }

 

+        #region IInventoryService

+

+        public bool CreateUserInventory(UUID user)

+        {

+            return m_InventoryService.CreateUserInventory(user);

+        }

+

+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)

+        {

+            return m_InventoryService.GetInventorySkeleton(userId);

+        }

+

+        public InventoryCollection GetUserInventory(UUID id)

+        {

+            return m_InventoryService.GetUserInventory(id);

+        }

+

         public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)

         {

             m_InventoryService.GetUserInventory(userID, callback);

         }

 

+        public List<InventoryItemBase> GetFolderItems(UUID folderID)

+        {

+            return m_InventoryService.GetFolderItems(folderID);

+        }

+

         /// <summary>

         /// Add a new folder to the user's inventory

         /// </summary>

@@ -242,5 +264,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
             return m_InventoryService.RequestRootFolder(userID);

         }

 

+        public List<InventoryItemBase> GetActiveGestures(UUID userId)

+        {

+            return m_InventoryService.GetActiveGestures(userId);

+        }

+        #endregion IInventoryService

     }

 }

diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
index ddb6cff..b695fce 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
@@ -122,6 +122,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
 
         #region IInventoryService
 
+        public bool CreateUserInventory(UUID user)
+        {
+            return false;
+        }
+
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        {
+            return new List<InventoryFolderBase>();
+        }
+
+        public InventoryCollection GetUserInventory(UUID userID)
+        {
+            return null;
+        }
+
         public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
         {
             UUID sessionID = GetSessionID(userID);
@@ -140,6 +155,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
 
         }
 
+        public List<InventoryItemBase> GetFolderItems(UUID folderID)
+        {
+            return new List<InventoryItemBase>();
+        }
+
         public bool AddFolder(InventoryFolderBase folder)
         {
             if (folder == null)
@@ -231,6 +251,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
             return null;
         }
 
+        public List<InventoryItemBase> GetActiveGestures(UUID userId)
+        {
+            return new List<InventoryItemBase>();
+        }
+
         #endregion
 
         private UUID GetSessionID(UUID userID)