diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-14 02:47:44 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-14 02:47:44 +0200 |
| commit | 4b98ae6e8a4c54fa70246beb5d7ff28a5590e819 (patch) | |
| tree | 11e49d0cb85d8420ac614f039b32e5ec16202de3 /indra/newview/llinventorybridge.cpp | |
| parent | 0db9bcf21fd4b7172e8a35cdb2805ccdc736e273 (diff) | |
| parent | 07ace73c49918ffb70e99c2239849eaaabc1fe45 (diff) | |
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
# indra/newview/llspatialpartition.cpp
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 6dfa3ea927..7a9d0ff7a7 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); |