diff options
author | Snoopy Pfeffer | 2011-08-22 14:51:43 +0200 |
---|---|---|
committer | Snoopy Pfeffer | 2011-08-22 14:51:43 +0200 |
commit | db91044593fc2592c7abb21034aeea8965febbd7 (patch) | |
tree | d0cf5b6a01d4fa323abc8d0ae60c4c298db89432 /OpenSim/Region/CoreModules/Avatar/Inventory/Transfer | |
parent | read m_rpcHandlersKeepAlive under appropriate lock (diff) | |
download | opensim-SC_OLD-db91044593fc2592c7abb21034aeea8965febbd7.zip opensim-SC_OLD-db91044593fc2592c7abb21034aeea8965febbd7.tar.gz opensim-SC_OLD-db91044593fc2592c7abb21034aeea8965febbd7.tar.bz2 opensim-SC_OLD-db91044593fc2592c7abb21034aeea8965febbd7.tar.xz |
Thanks Neil Canham for fixing bulk inventory updates, no sending BulkInventoryUpdate after accepting inventory items.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index e3d4969..b4f69e6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -278,7 +278,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
278 | else | 278 | else |
279 | { | 279 | { |
280 | if (m_TransferModule != null) | 280 | if (m_TransferModule != null) |
281 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); | 281 | m_TransferModule.SendInstantMessage(im, delegate(bool success) { |
282 | // Send BulkUpdateInventory | ||
283 | IInventoryService invService = scene.InventoryService; | ||
284 | UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip | ||
285 | |||
286 | InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId); | ||
287 | folder = invService.GetFolder(folder); | ||
288 | |||
289 | ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID)); | ||
290 | |||
291 | fromUser.ControllingClient.SendBulkUpdateInventory(folder); | ||
292 | }); | ||
282 | } | 293 | } |
283 | } | 294 | } |
284 | else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) | 295 | else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) |