aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-04-29 17:14:44 +0100
committerMelanie2013-04-30 01:25:21 +0100
commit5a4cb539d2e685d604b00419040da4a752e074aa (patch)
treee5ad7ef28d8eb0d0ba1f27df97396865a81c982a
parentMerge branch 'ubitwork' into avination-current (diff)
downloadopensim-SC-5a4cb539d2e685d604b00419040da4a752e074aa.zip
opensim-SC-5a4cb539d2e685d604b00419040da4a752e074aa.tar.gz
opensim-SC-5a4cb539d2e685d604b00419040da4a752e074aa.tar.bz2
opensim-SC-5a4cb539d2e685d604b00419040da4a752e074aa.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.cs10
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 ae58dfd..f122d00 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 im.offline = 0; 255 im.offline = 0;