diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-09-09 14:20:19 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-09-09 14:20:19 -0400 |
commit | 8a952e42e97cfb286192aba0fbfc43986912cd29 (patch) | |
tree | 6aa00aad42189239aa81972328e057afc215bf7d /indra/newview/llparticipantlist.cpp | |
parent | c47b398b75fcdbb479ad9ad2765014c5fa338df7 (diff) | |
parent | 89b9800579a37fbbdfca7789716a2d012d96cfa5 (diff) |
Removed some spurious newlines that I introduced into CMakeLists.txt.
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
-rw-r--r-- | indra/newview/llparticipantlist.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 54053cf89f..fb1153980a 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -798,11 +798,19 @@ void LLParticipantList::LLParticipantListMenu::toggleMuteVoice(const LLSD& userd bool LLParticipantList::LLParticipantListMenu::isGroupModerator() { - // Agent is in Group Call + if (!mParent.mSpeakerMgr) + { + llwarns << "Speaker manager is missing" << llendl; + return false; + } + + // Is session a group call/chat? if(gAgent.isInGroup(mParent.mSpeakerMgr->getSessionID())) { - // Agent is Moderator - return mParent.mSpeakerMgr->findSpeaker(gAgentID)->mIsModerator; + LLSpeaker* speaker = mParent.mSpeakerMgr->findSpeaker(gAgentID).get(); + + // Is agent a moderator? + return speaker && speaker->mIsModerator; } return false; } |