diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 120fd43..b33342f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -277,19 +277,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
277 | { | 277 | { |
278 | if (m_TransferModule != null) | 278 | if (m_TransferModule != null) |
279 | m_TransferModule.SendInstantMessage(im, delegate(bool success) { | 279 | m_TransferModule.SendInstantMessage(im, delegate(bool success) { |
280 | // Send BulkUpdateInventory | ||
281 | IInventoryService invService = scene.InventoryService; | ||
282 | UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip | ||
283 | 280 | ||
284 | InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId); | 281 | // justincc - FIXME: Comment out for now. This code was added in commit db91044 Mon Aug 22 2011 |
285 | folder = invService.GetFolder(folder); | 282 | // and is apparently supposed to fix bulk inventory updates after accepting items. But |
286 | 283 | // instead it appears to cause two copies of an accepted folder for the receiving user in | |
287 | ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID)); | 284 | // at least some cases. Folder/item update is already done when the offer is made (see code above) |
288 | 285 | ||
289 | // If the user has left the scene by the time the message comes back then we can't send | 286 | // // Send BulkUpdateInventory |
290 | // them the update. | 287 | // IInventoryService invService = scene.InventoryService; |
291 | if (fromUser != null) | 288 | // UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip |
292 | fromUser.ControllingClient.SendBulkUpdateInventory(folder); | 289 | // |
290 | // InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId); | ||
291 | // folder = invService.GetFolder(folder); | ||
292 | // | ||
293 | // ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID)); | ||
294 | // | ||
295 | // // If the user has left the scene by the time the message comes back then we can't send | ||
296 | // // them the update. | ||
297 | // if (fromUser != null) | ||
298 | // fromUser.ControllingClient.SendBulkUpdateInventory(folder); | ||
293 | }); | 299 | }); |
294 | } | 300 | } |
295 | } | 301 | } |