summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroup.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-10-12 16:24:05 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-10-12 16:24:05 -0400
commita16a6034c25c5e78331ef1bd13485df8759456e5 (patch)
treec1d1ef6f387daa81039b27a2cdb435a31c25b5d7 /indra/newview/llpanelgroup.cpp
parent5b58bfb937f7f996c7f1b97f15b1c837aa23a463 (diff)
parent4312629e7c5749b86add9d42e6e550602f34dbf5 (diff)
merge
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
-rwxr-xr-xindra/newview/llpanelgroup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index f67a90fd01..342b57ba4a 100755
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -338,7 +338,7 @@ void LLPanelGroup::update(LLGroupChange gc)
group_name_ctrl->setToolTip(group_name);
LLGroupData agent_gdatap;
- bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlike();
+ bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlikeWithoutAdminMenuFakery();
bool join_btn_visible = !is_member && gdatap->mOpenEnrollment;
mButtonJoin->setVisible(join_btn_visible);
@@ -470,7 +470,7 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
}
LLGroupData agent_gdatap;
- bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlike();
+ bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlikeWithoutAdminMenuFakery();
tab_roles->setVisible(is_member);
tab_notices->setVisible(is_member);