diff options
Diffstat (limited to 'indra/newview')
| -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;  } | 
