diff options
author | Justin Clark-Casey (justincc) | 2013-04-29 17:14:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-05-03 22:41:09 +0100 |
commit | 326522dc3d5206069d8156b3212f5b2b526eb120 (patch) | |
tree | 8b63efd7843f330085a0a478fa3320e2960d3e91 /OpenSim | |
parent | Fix issue in the mesh upload flag module where the ID of the last agent to re... (diff) | |
download | opensim-SC_OLD-326522dc3d5206069d8156b3212f5b2b526eb120.zip opensim-SC_OLD-326522dc3d5206069d8156b3212f5b2b526eb120.tar.gz opensim-SC_OLD-326522dc3d5206069d8156b3212f5b2b526eb120.tar.bz2 opensim-SC_OLD-326522dc3d5206069d8156b3212f5b2b526eb120.tar.xz |
Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index bcb7f42..e1ada97 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -213,7 +213,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
213 | user.ControllingClient.SendBulkUpdateInventory(folderCopy); | 213 | user.ControllingClient.SendBulkUpdateInventory(folderCopy); |
214 | 214 | ||
215 | // HACK!! | 215 | // HACK!! |
216 | im.imSessionID = folderID.Guid; | 216 | // Insert the ID of the copied item into the IM so that we know which item to move to trash if it |
217 | // is rejected. | ||
218 | // XXX: This is probably a misuse of the session ID slot. | ||
219 | im.imSessionID = copyID.Guid; | ||
217 | } | 220 | } |
218 | else | 221 | else |
219 | { | 222 | { |
@@ -243,7 +246,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
243 | user.ControllingClient.SendBulkUpdateInventory(itemCopy); | 246 | user.ControllingClient.SendBulkUpdateInventory(itemCopy); |
244 | 247 | ||
245 | // HACK!! | 248 | // HACK!! |
246 | im.imSessionID = itemID.Guid; | 249 | // Insert the ID of the copied item into the IM so that we know which item to move to trash if it |
250 | // is rejected. | ||
251 | // XXX: This is probably a misuse of the session ID slot. | ||
252 | im.imSessionID = copyID.Guid; | ||
247 | } | 253 | } |
248 | 254 | ||
249 | // Send the IM to the recipient. The item is already | 255 | // Send the IM to the recipient. The item is already |