From 830f1d99f4b919c521ae726e9d2a6da56860361b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 4 Jan 2024 11:23:07 -0500
Subject: [PATCH] Fix failure to correctly set block/unblock text on avatar
menus
---
indra/newview/lltoolpie.cpp | 8 ++++++--
.../skins/default/xui/en/menu_attachment_other.xml | 4 ++--
indra/newview/skins/default/xui/en/menu_avatar_other.xml | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 454be9d6eee..afcdcb06595 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1964,12 +1964,16 @@ BOOL LLToolPie::handleRightClickPick()
// [/RLVa:KB]
if (is_other_attachment)
{
- gMenuAttachmentOther->getChild<LLUICtrl>("Avatar Mute")->setValue(mute_msg);
+ if(auto av_manage = gMenuHolder->findChild<LLUICtrl>("Avatar Attachment Manage"))
+ if(auto av_mute = av_manage->findChild<LLUICtrl>("Avatar Mute"))
+ av_mute->setValue(mute_msg);
gMenuAttachmentOther->show(x, y);
}
else
{
- gMenuAvatarOther->getChild<LLUICtrl>("Avatar Mute")->setValue(mute_msg);
+ if (auto av_manage = gMenuHolder->findChild<LLUICtrl>("Avatar Manage"))
+ if (auto av_mute = av_manage->findChild<LLUICtrl>("Avatar Mute"))
+ av_mute->setValue(mute_msg);
gMenuAvatarOther->show(x, y);
}
// [RLVa:KB] - Checked: 2010-04-11 (RLVa-1.2.0e) | Modified: RLVa-1.1.0l
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 035e591f757..6011f611ae4 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -2,7 +2,7 @@
<!-- *NOTE: See also menu_avatar_other.xml -->
<context_menu
layout="topleft"
- name="Avatar Pie">
+ name="Avatar Attachment Pie">
<menu_item_call
label="View Profile"
name="Profile...">
@@ -174,7 +174,7 @@
</context_menu>
<context_menu
label="Manage"
- name="Manage">
+ name="Avatar Attachment Manage">
<menu_item_call
enabled="false"
label="Block"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 85343decce6..2c7a25f0c3d 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -176,7 +176,7 @@
</context_menu>
<context_menu
label="Manage"
- name="Manage">
+ name="Avatar Manage">
<menu_item_call
enabled="false"
label="Block"
--
GitLab