summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2009-12-11 18:53:55 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2009-12-11 18:53:55 +0200
commit5f0b2624bc40c6c7580fa7c02f137c3dee330b94 (patch)
tree8a4bd5787a235de617ddb8de5bebbc455ac79d03 /indra
parent77b5ee1b4d7fb03f757efdaa4169ab38fb754b25 (diff)
Update for major task EXT-3390 - Move Moderation options into submenu.
Minor code change. --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llparticipantlist.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index 1986a98fb7..b787699a66 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -491,10 +491,12 @@ void LLParticipantList::LLParticipantListMenu::toggleMuteVoice(const LLSD& userd
bool LLParticipantList::LLParticipantListMenu::isGroupModerator()
{
// Agent is in Group Call
- bool is_in_group = gAgent.isInGroup(mParent.mSpeakerMgr->getSessionID());
- // Agent is Moderator
- bool is_moderator = mParent.mSpeakerMgr->findSpeaker(gAgentID)->mIsModerator;
- return is_in_group && is_moderator;
+ if(gAgent.isInGroup(mParent.mSpeakerMgr->getSessionID()))
+ {
+ // Agent is Moderator
+ return mParent.mSpeakerMgr->findSpeaker(gAgentID)->mIsModerator;
+ }
+ return false;
}
bool LLParticipantList::LLParticipantListMenu::isMuted(const LLUUID& avatar_id)