diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-10-17 01:17:51 +0300 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-10-17 21:26:39 +0300 |
| commit | 7d82ee8075e81a6d3640103b68e98a6a2cbbe623 (patch) | |
| tree | b51e458810b38149f4a7d13a75406efb5ff000f8 /indra/newview/llinventorygallerymenu.cpp | |
| parent | ce83f77e7a5f32ac00b0a563fcf68ff98957f684 (diff) | |
SL-20232 Allow deletion of folders with worn content in gallery view #4
Diffstat (limited to 'indra/newview/llinventorygallerymenu.cpp')
| -rw-r--r-- | indra/newview/llinventorygallerymenu.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp index 49969e1a52..2bca33dec4 100644 --- a/indra/newview/llinventorygallerymenu.cpp +++ b/indra/newview/llinventorygallerymenu.cpp @@ -425,7 +425,6 @@ bool is_category_removable(const LLUUID &folder_id, bool check_worn) return true; } - void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* menu) { LLUUID selected_id = mUUIDs.front(); @@ -581,11 +580,15 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men items.push_back(std::string("Cut")); items.push_back(std::string("Delete")); - if(!is_category_removable(selected_id, true)) + if(!is_category_removable(selected_id, false)) { disabled_items.push_back(std::string("Delete")); disabled_items.push_back(std::string("Cut")); } + else if (!is_category_removable(selected_id, true)) + { + disabled_items.push_back(std::string("Cut")); + } if(!is_inbox) { |