diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-25 00:31:01 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-25 00:31:48 +0300 |
| commit | bc495fe39aa682c4142840bee323792f836a9d6c (patch) | |
| tree | c08d68bb294b07d0be757e69d6dd6b1b6a16f27a /indra/newview | |
| parent | 7345cd16625b9fc5db03877aaf4efc1d7db22389 (diff) | |
SL-17458 Cut works the same way as Copy when pasting into Favorites
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 342920630b..1294bb4d92 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3798,7 +3798,20 @@ void LLFolderBridge::perform_pasteFromClipboard() { if (item && can_move_to_landmarks(item)) { - dropToFavorites(item); + if (LLClipboard::instance().isCutMode()) + { + LLViewerInventoryItem* viitem = dynamic_cast<LLViewerInventoryItem*>(item); + llassert(viitem); + if (viitem) + { + //changeItemParent() implicity calls dirtyFilter + changeItemParent(model, viitem, parent_id, FALSE); + } + } + else + { + dropToFavorites(item); + } } } else if (LLClipboard::instance().isCutMode()) |