diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index bef716b..201442c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -212,7 +212,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
212 | 212 | ||
213 | public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | 213 | public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) |
214 | { | 214 | { |
215 | return new List<InventoryItemBase>(); | 215 | UUID sessionID = GetSessionID(userID); |
216 | return m_RemoteConnector.GetFolderItems(userID.ToString(), folderID, sessionID); | ||
216 | } | 217 | } |
217 | 218 | ||
218 | public override bool AddFolder(InventoryFolderBase folder) | 219 | public override bool AddFolder(InventoryFolderBase folder) |
@@ -272,13 +273,25 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
272 | return m_RemoteConnector.UpdateItem(item.Owner.ToString(), item, sessionID); | 273 | return m_RemoteConnector.UpdateItem(item.Owner.ToString(), item, sessionID); |
273 | } | 274 | } |
274 | 275 | ||
275 | public override bool DeleteItem(InventoryItemBase item) | 276 | public override bool MoveItems(UUID ownerID, List<InventoryItemBase> items) |
276 | { | 277 | { |
277 | if (item == null) | 278 | if (items == null) |
278 | return false; | 279 | return false; |
279 | 280 | ||
280 | UUID sessionID = GetSessionID(item.Owner); | 281 | UUID sessionID = GetSessionID(ownerID); |
281 | return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID); | 282 | return m_RemoteConnector.MoveItems(ownerID.ToString(), items, sessionID); |
283 | } | ||
284 | |||
285 | |||
286 | public override bool DeleteItems(UUID ownerID, List<UUID> itemIDs) | ||
287 | { | ||
288 | if (itemIDs == null) | ||
289 | return false; | ||
290 | if (itemIDs.Count == 0) | ||
291 | return true; | ||
292 | |||
293 | UUID sessionID = GetSessionID(ownerID); | ||
294 | return m_RemoteConnector.DeleteItems(ownerID.ToString(), itemIDs, sessionID); | ||
282 | } | 295 | } |
283 | 296 | ||
284 | public override InventoryItemBase GetItem(InventoryItemBase item) | 297 | public override InventoryItemBase GetItem(InventoryItemBase item) |
@@ -320,14 +333,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
320 | 333 | ||
321 | private UUID GetSessionID(UUID userID) | 334 | private UUID GetSessionID(UUID userID) |
322 | { | 335 | { |
323 | if (m_Scene == null) | 336 | //if (m_Scene == null) |
324 | { | 337 | //{ |
325 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null"); | 338 | // m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null"); |
326 | } | 339 | //} |
327 | 340 | ||
328 | if (m_UserProfileService == null) | 341 | if (m_UserProfileService == null) |
329 | { | 342 | { |
330 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null"); | 343 | //m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null"); |
331 | return UUID.Zero; | 344 | return UUID.Zero; |
332 | } | 345 | } |
333 | 346 | ||