diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-22 17:10:47 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-22 17:10:47 +0000 |
| commit | 04712617c55c53dbec1f73a4e8834ebe3167e5ed (patch) | |
| tree | e14e202280a13045a95693144c0dbbf98197d7b5 /indra/newview/llpanelgroup.cpp | |
| parent | 96ddf30a49a4ebca25816701373c34674088b2ce (diff) | |
| parent | fa9811e0c5dbd249a9c6e37d95d2d842d43658a2 (diff) | |
merge of viewer2 trunk and 'EXT-5601: Linux: volume adjustment of web-based media / Flash'
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
| -rw-r--r-- | 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 61463ed843..706787e824 100644 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -337,7 +337,7 @@ void LLPanelGroup::update(LLGroupChange gc) childSetToolTip("group_name",gdatap->mName); LLGroupData agent_gdatap; - bool is_member = gAgent.getGroupData(mID,agent_gdatap); + bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlike(); bool join_btn_visible = !is_member && gdatap->mOpenEnrollment; mButtonJoin->setVisible(join_btn_visible); @@ -466,7 +466,7 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) } LLGroupData agent_gdatap; - bool is_member = gAgent.getGroupData(mID,agent_gdatap); + bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlike(); tab_roles->setVisible(is_member); tab_notices->setVisible(is_member); |