diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:45 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:45 -0800 |
| commit | 32de0cb67d824498d0fc9d489ce19731ebfddfdf (patch) | |
| tree | 9fd52f420543a5c4dc45215d7ed49faf94f386fe /indra/newview/llinventorybridge.cpp | |
| parent | 7bfe590a3669a005d4269cdcf378891080264dce (diff) | |
| parent | 4c791e098d3abafa406e0e269038c40aae67f66c (diff) | |
Merge branch 'DRTVWR-596' into DRTVWR-601
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index cb5316ddf4..932a0316dd 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4336,7 +4336,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")); } @@ -6510,6 +6511,7 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { items.push_back(std::string("Activate")); } + items.push_back(std::string("PlayGesture")); } addLinkReplaceMenuOption(items, disabled_items); hide_context_entries(menu, items, disabled_items); |