From 5f0b2624bc40c6c7580fa7c02f137c3dee330b94 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 11 Dec 2009 18:53:55 +0200
Subject: Update for major task EXT-3390 - Move Moderation options into
 submenu. Minor code change.

--HG--
branch : product-engine
---
 indra/newview/llparticipantlist.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra')

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)
-- 
cgit v1.2.3