diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-13 13:09:53 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-13 13:09:53 -0800 |
| commit | a96271e3c2958a95040a1348934bd3f056f374ab (patch) | |
| tree | 1cdc6b3530f5cd80f453c9f4fa49d74e0f42afa1 /indra | |
| parent | 2f14bed8b2610f53c28881a9e2e19fd7a0be51fa (diff) | |
EXP-1716 FIX -- Merchant outbox drag and drop always creates new folder
* Items dragged to child folder now appear under that folder rather than in new separate top-level folder.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index aabe851f79..3d20b99c9b 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3461,7 +3461,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, } else if (move_is_into_outbox && !move_is_from_outbox) { - copy_item_to_outbox(inv_item, outbox_id, LLUUID::null); + copy_item_to_outbox(inv_item, mUUID, LLUUID::null); } // NORMAL or TRASH folder // (move the item, restamp if into trash) |