From 00c65ca611386957c3237ffb6466b87e6fed077c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 4 Oct 2023 23:03:41 -0400
Subject: [PATCH] Add attachment point id to menus
---
indra/newview/llinventorybridge.cpp | 7 ++++---
indra/newview/llviewerattachmenu.cpp | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index d108d9ce00c..c2d7a0b350d 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -7269,13 +7269,14 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
LLViewerJointAttachment* attachment = attach_pair.second;
LLMenuItemCallGL::Params p;
std::string submenu_name = attachment->getName();
- if (LLTrans::getString(submenu_name) != "")
+ std::string translated_submenu_name;
+ if (LLTrans::findString(translated_submenu_name, submenu_name))
{
- p.name = (" ")+LLTrans::getString(submenu_name)+" ";
+ p.name = attachment->getIsHUDAttachment() ? translated_submenu_name : fmt::format(FMT_STRING("{} ({})"), translated_submenu_name, attach_pair.first);
}
else
{
- p.name = submenu_name;
+ p.name = attachment->getIsHUDAttachment() ? submenu_name : fmt::format(FMT_STRING("{} ({})"), submenu_name, attach_pair.first);
}
LLSD cbparams;
cbparams["index"] = attach_pair.first;
diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp
index 261232cecdc..9946d2706ea 100644
--- a/indra/newview/llviewerattachmenu.cpp
+++ b/indra/newview/llviewerattachmenu.cpp
@@ -67,11 +67,11 @@ void LLViewerAttachMenu::populateMenus(const std::string& attach_to_menu_name, c
if (LLTrans::findString(translated_submenu_name, submenu_name))
{
- p.name = (" ") + translated_submenu_name + " ";
+ p.name = attachment->getIsHUDAttachment() ? translated_submenu_name : fmt::format(FMT_STRING("{} ({})"), translated_submenu_name, attach_pair.first);
}
else
{
- p.name = submenu_name;
+ p.name = attachment->getIsHUDAttachment() ? submenu_name : fmt::format(FMT_STRING("{} ({})"), submenu_name, attach_pair.first);
}
LLSD cbparams;
--
GitLab