diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-07-15 14:23:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-15 14:23:44 +0300 |
| commit | d573bc2f926fb6ff473d9b346cdeb4d73e3b0ab3 (patch) | |
| tree | 27bf21e9b200dc59a870bbc17c293aa0233761ca /indra/newview/llinventorybridge.cpp | |
| parent | 8b89a721950d00bfc1617181e42e745c81cc9d5d (diff) | |
SL-20011 Restrict 'Empty Trash' if objects are attached
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index db347f7096..31b1cb7a23 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4141,7 +4141,8 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items || is_recent_panel || !trash || trash->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN - || trash->getDescendentCount() == LLViewerInventoryCategory::VERSION_UNKNOWN) + || trash->getDescendentCount() == LLViewerInventoryCategory::VERSION_UNKNOWN + || gAgentAvatarp->hasAttachmentsInTrash()) { disabled_items.push_back(std::string("Empty Trash")); } |