diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-11-06 15:28:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-06 15:28:26 +0200 |
| commit | d079c11c99c381a3e9aae292e132c67f39d038ff (patch) | |
| tree | 45d7dab06204ce562fcc72ed71617cef73a8b417 /indra/newview/llinventorybridge.cpp | |
| parent | 0ab4edd019d84aa5683b9cc77c66e81be2fa58a4 (diff) | |
SL-20565 Places floater -- allow dragging a folder into a folder (#491)
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -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 73005d6903..fddf5179fa 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2796,7 +2796,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, is_movable = can_move_folder_to_marketplace(master_folder, dest_folder, inv_cat, tooltip_msg, bundle_size); } - if (is_movable) + if (is_movable && !move_is_into_landmarks) { LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); is_movable = active_panel != NULL; |