diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
| commit | 2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch) | |
| tree | f45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/newview/llpanelgroup.cpp | |
| parent | 8729f5d23a52263e55df5574c672c87d00b563bd (diff) | |
| parent | a16a6034c25c5e78331ef1bd13485df8759456e5 (diff) | |
Pulled merge from llinternal/bento-box.
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); |