aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-04-30 23:40:06 +0200
committerMelanie2013-04-30 23:40:06 +0200
commit958a500692a51e6d5524147b6eb68448849f4c04 (patch)
treee3bedb0335516b8a2b9b75a3f959d95c2bb66145
parentFix CAPS to work like they should - do not send caps to the viewer if they're... (diff)
parentFix bug where an agent that declined an inventory offer and subsequently empt... (diff)
downloadopensim-SC_OLD-958a500692a51e6d5524147b6eb68448849f4c04.zip
opensim-SC_OLD-958a500692a51e6d5524147b6eb68448849f4c04.tar.gz
opensim-SC_OLD-958a500692a51e6d5524147b6eb68448849f4c04.tar.bz2
opensim-SC_OLD-958a500692a51e6d5524147b6eb68448849f4c04.tar.xz
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
-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;