From 16d50032741925c34176da0cca153e7b7de6e325 Mon Sep 17 00:00:00 2001 From: diva Date: Mon, 8 Jun 2009 03:09:24 +0000 Subject: Added more functions to IInventoryService. Unsure about whether all of these are really necessary. --- .../Inventory/HGInventoryBroker.cs | 31 ++++++++++++++++++++++ .../Inventory/LocalInventoryServiceConnector.cs | 27 +++++++++++++++++++ .../Inventory/RemoteInventoryServiceConnector.cs | 25 +++++++++++++++++ 3 files changed, 83 insertions(+) (limited to 'OpenSim/Region') 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 GetInventorySkeleton(UUID userId) + { + return new List(); + } + + 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 GetFolderItems(UUID folderID) + { + return new List(); + } + public bool AddFolder(InventoryFolderBase folder) { if (folder == null) @@ -316,6 +342,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory return null; } + public List GetActiveGestures(UUID userId) + { + return new List(); + } + #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 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 GetFolderItems(UUID folderID) + { + return m_InventoryService.GetFolderItems(folderID); + } + /// /// Add a new folder to the user's inventory /// @@ -242,5 +264,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory return m_InventoryService.RequestRootFolder(userID); } + public List 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 GetInventorySkeleton(UUID userId) + { + return new List(); + } + + 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 GetFolderItems(UUID folderID) + { + return new List(); + } + public bool AddFolder(InventoryFolderBase folder) { if (folder == null) @@ -231,6 +251,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory return null; } + public List GetActiveGestures(UUID userId) + { + return new List(); + } + #endregion private UUID GetSessionID(UUID userID) -- cgit v1.1