From ece46db4b234960b1510c5dcd6d3da5088f8c6f2 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 20 Oct 2023 13:44:55 +0300
Subject: [PATCH] SL-20380 show group notice button only if user is a member of
the group (#465)
---
indra/newview/llgrouplist.cpp | 11 +++++++----
.../default/xui/en/panel_group_list_item_short.xml | 3 ++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index d1374405473..14310536b2a 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -475,14 +475,17 @@ void LLGroupListItem::onMouseEnter(S32 x, S32 y, MASK mask)
{
mInfoBtn->setVisible(true);
mProfileBtn->setVisible(true);
- mNoticesBtn->setVisible(true);
- if (mForAgent && mVisibilityHideBtn)
+ if (mForAgent)
{
LLGroupData agent_gdatap;
if (gAgent.getGroupData(mGroupID, agent_gdatap))
{
- mVisibilityHideBtn->setVisible(agent_gdatap.mListInProfile);
- mVisibilityShowBtn->setVisible(!agent_gdatap.mListInProfile);
+ if (mVisibilityHideBtn)
+ {
+ mVisibilityHideBtn->setVisible(agent_gdatap.mListInProfile);
+ mVisibilityShowBtn->setVisible(!agent_gdatap.mListInProfile);
+ }
+ mNoticesBtn->setVisible(true);
}
}
}
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
index 042a5f388be..9e19588033e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
@@ -64,7 +64,8 @@
follows="right"
image_pressed="Group_Notices"
image_unselected="Group_Notices"
- tab_stop="false"/>
+ tab_stop="false"
+ visible="false"/>
<button
name="visibility_hide_btn"
tool_tip="Hide group on my profile"
--
GitLab