diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-08-15 09:53:26 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-08-15 09:53:26 -0700 |
| commit | 6f7132ca77d0507f2744bea5050a2ab1135cd88a (patch) | |
| tree | 147d3260c4d9360c1f9f03c5daba2c0ab8d0a60c /indra/newview/llinventorybridge.cpp | |
| parent | 18ee1f48f9f5b8559385b88f86ab8c9bccfcb3c8 (diff) | |
deleting folders after no-copy move to outbox
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index a6a8bc662f..ac53532e32 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1678,7 +1678,7 @@ static BOOL can_move_to_outbox(LLInventoryItem* inv_item) void LLFolderBridge::dropFolderToOutbox(LLInventoryCategory* inv_cat) { - copy_folder_to_outbox(inv_cat, getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false)); + copy_folder_to_outbox(inv_cat, getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false), inv_cat->getUUID()); } BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, @@ -3247,7 +3247,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, } else if (move_is_into_outbox) { - copy_item_to_outbox(inv_item, outbox_id); + copy_item_to_outbox(inv_item, outbox_id, LLUUID::null); } // NORMAL or TRASH folder // (move the item, restamp if into trash) |