diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 2d3ba82..978b9d9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -172,21 +172,12 @@ 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); |
187 | } | 178 | } |
188 | 179 | ||
189 | public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) | 180 | public InventoryFolderBase GetFolderForType(UUID userID, FolderType type) |
190 | { | 181 | { |
191 | return m_RemoteConnector.GetFolderForType(userID, type); | 182 | return m_RemoteConnector.GetFolderForType(userID, type); |
192 | } | 183 | } |
@@ -195,22 +186,29 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
195 | { | 186 | { |
196 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); | 187 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); |
197 | 188 | ||
198 | if (invCol != null && UserManager != null) | 189 | // Commenting this for now, because it's causing more grief than good |
199 | { | 190 | //if (invCol != null && UserManager != null) |
200 | // Protect ourselves against the caller subsequently modifying the items list | 191 | //{ |
201 | List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items); | 192 | // // Protect ourselves against the caller subsequently modifying the items list |
202 | 193 | // List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items); | |
203 | if (items != null && items.Count > 0) | 194 | |
204 | Util.FireAndForget(delegate | 195 | // if (items != null && items.Count > 0) |
205 | { | 196 | // //Util.FireAndForget(delegate |
206 | foreach (InventoryItemBase item in items) | 197 | // //{ |
207 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); | 198 | // foreach (InventoryItemBase item in items) |
208 | }); | 199 | // if (!string.IsNullOrEmpty(item.CreatorData)) |
209 | } | 200 | // UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); |
201 | // //}); | ||
202 | //} | ||
210 | 203 | ||
211 | return invCol; | 204 | return invCol; |
212 | } | 205 | } |
213 | 206 | ||
207 | public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) | ||
208 | { | ||
209 | return m_RemoteConnector.GetMultipleFoldersContent(principalID, folderIDs); | ||
210 | } | ||
211 | |||
214 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | 212 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) |
215 | { | 213 | { |
216 | return m_RemoteConnector.GetFolderItems(userID, folderID); | 214 | return m_RemoteConnector.GetFolderItems(userID, folderID); |
@@ -305,6 +303,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
305 | return m_RemoteConnector.GetItem(item); | 303 | return m_RemoteConnector.GetItem(item); |
306 | } | 304 | } |
307 | 305 | ||
306 | public InventoryItemBase[] GetMultipleItems(UUID userID, UUID[] itemIDs) | ||
307 | { | ||
308 | if (itemIDs == null) | ||
309 | return new InventoryItemBase[0]; | ||
310 | |||
311 | return m_RemoteConnector.GetMultipleItems(userID, itemIDs); | ||
312 | } | ||
313 | |||
308 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 314 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
309 | { | 315 | { |
310 | //m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); | 316 | //m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); |