diff options
Diffstat (limited to 'OpenSim/Region')
5 files changed, 1 insertions, 67 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs index 49589fd..01814a1 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs | |||
@@ -142,22 +142,6 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
142 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) { return null; } | 142 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) { return null; } |
143 | 143 | ||
144 | /// <summary> | 144 | /// <summary> |
145 | /// Synchronous inventory fetch. | ||
146 | /// </summary> | ||
147 | /// <param name="userID"></param> | ||
148 | /// <returns></returns> | ||
149 | public InventoryCollection GetUserInventory(UUID userID) { return null; } | ||
150 | |||
151 | /// <summary> | ||
152 | /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the | ||
153 | /// inventory has been received | ||
154 | /// </summary> | ||
155 | /// <param name="userID"></param> | ||
156 | /// <param name="callback"></param> | ||
157 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) { } | ||
158 | |||
159 | |||
160 | /// <summary> | ||
161 | /// Gets the user folder for the given folder-type | 145 | /// Gets the user folder for the given folder-type |
162 | /// </summary> | 146 | /// </summary> |
163 | /// <param name="userID"></param> | 147 | /// <param name="userID"></param> |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 77a3c82..fd41187 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -316,29 +316,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
316 | return connector.GetInventorySkeleton(userID); | 316 | return connector.GetInventorySkeleton(userID); |
317 | } | 317 | } |
318 | 318 | ||
319 | public InventoryCollection GetUserInventory(UUID userID) | ||
320 | { | ||
321 | string invURL = GetInventoryServiceURL(userID); | ||
322 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetUserInventory for {0} {1}", userID, invURL); | ||
323 | |||
324 | if (invURL == null) // not there, forward to local inventory connector to resolve | ||
325 | return m_LocalGridInventoryService.GetUserInventory(userID); | ||
326 | |||
327 | InventoryCollection c = m_Cache.GetUserInventory(userID); | ||
328 | if (c != null) | ||
329 | return c; | ||
330 | |||
331 | IInventoryService connector = GetConnector(invURL); | ||
332 | c = connector.GetUserInventory(userID); | ||
333 | |||
334 | m_Cache.Cache(userID, c); | ||
335 | return c; | ||
336 | } | ||
337 | |||
338 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | ||
339 | { | ||
340 | } | ||
341 | |||
342 | public InventoryFolderBase GetRootFolder(UUID userID) | 319 | public InventoryFolderBase GetRootFolder(UUID userID) |
343 | { | 320 | { |
344 | //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetRootFolder for {0}", userID); | 321 | //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetRootFolder for {0}", userID); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs index 2fc8ee3..499ca5e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -99,14 +99,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
99 | m_Inventories.AddOrUpdate(userID, inv, 120); | 99 | m_Inventories.AddOrUpdate(userID, inv, 120); |
100 | } | 100 | } |
101 | 101 | ||
102 | public InventoryCollection GetUserInventory(UUID userID) | ||
103 | { | ||
104 | InventoryCollection inv = null; | ||
105 | if (m_Inventories.TryGetValue(userID, out inv)) | ||
106 | return inv; | ||
107 | return null; | ||
108 | } | ||
109 | |||
110 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 102 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
111 | { | 103 | { |
112 | InventoryCollection inv = null; | 104 | InventoryCollection inv = null; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 6832b1f..f80fab3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -164,16 +164,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
164 | return m_InventoryService.GetInventorySkeleton(userId); | 164 | return m_InventoryService.GetInventorySkeleton(userId); |
165 | } | 165 | } |
166 | 166 | ||
167 | public InventoryCollection GetUserInventory(UUID id) | ||
168 | { | ||
169 | return m_InventoryService.GetUserInventory(id); | ||
170 | } | ||
171 | |||
172 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | ||
173 | { | ||
174 | m_InventoryService.GetUserInventory(userID, callback); | ||
175 | } | ||
176 | |||
177 | public InventoryFolderBase GetRootFolder(UUID userID) | 167 | public InventoryFolderBase GetRootFolder(UUID userID) |
178 | { | 168 | { |
179 | return m_InventoryService.GetRootFolder(userID); | 169 | return m_InventoryService.GetRootFolder(userID); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 7f78076..166e4a1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -172,15 +172,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
172 | return m_RemoteConnector.GetInventorySkeleton(userId); | 172 | return m_RemoteConnector.GetInventorySkeleton(userId); |
173 | } | 173 | } |
174 | 174 | ||
175 | public InventoryCollection GetUserInventory(UUID userID) | ||
176 | { | ||
177 | return m_RemoteConnector.GetUserInventory(userID); | ||
178 | } | ||
179 | |||
180 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | ||
181 | { | ||
182 | } | ||
183 | |||
184 | public InventoryFolderBase GetRootFolder(UUID userID) | 175 | public InventoryFolderBase GetRootFolder(UUID userID) |
185 | { | 176 | { |
186 | return m_RemoteConnector.GetRootFolder(userID); | 177 | return m_RemoteConnector.GetRootFolder(userID); |