From a96271e3c2958a95040a1348934bd3f056f374ab Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Tue, 13 Dec 2011 13:09:53 -0800 Subject: 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. --- indra/newview/llinventorybridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorybridge.cpp') 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) -- cgit v1.2.3