diff options
author | Rider Linden <rider@lindenlab.com> | 2015-10-19 12:03:08 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-10-19 12:03:08 -0700 |
commit | 53b947e0397d6b88fdc6c0a10144e5a6d02a67d3 (patch) | |
tree | 38c94f216386ba6653e8152d9db0198807f4f2cc /indra/newview/llpanelgroup.cpp | |
parent | ed7963bad14abd628fa60d0d5baf357f1858c48c (diff) | |
parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) |
Merge from viewer release.
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
-rwxr-xr-x | indra/newview/llpanelgroup.cpp | 4 |
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); |