Merge with default branch, resolved conflict in llpanelavatar.cpp

--HG--
branch : product-engine

1 files changed, 46 insertions, 29 deletions

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index acbca60103..0374a1d25b 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -278,7 +278,7 @@ void LLInspectAvatar::onOpen(const LLSD& data)
 	
 	getChild<LLUICtrl>("gear_self_btn")->setVisible(self);
 	getChild<LLUICtrl>("gear_btn")->setVisible(!self);
-	
+
 	// Position the inspector relative to the mouse cursor
 	// Similar to how tooltips are positioned
 	// See LLToolTipMgr::createToolTip
@@ -403,7 +403,8 @@ void LLInspectAvatar::updateModeratorPanel()
 {
 	bool enable_moderator_panel = false;
 
-    if (LLVoiceChannel::getCurrentVoiceChannel())
+    if (LLVoiceChannel::getCurrentVoiceChannel() &&
+		mAvatarID != gAgent.getID())
     {
 		LLUUID session_id = LLVoiceChannel::getCurrentVoiceChannel()->getSessionID();
 
@@ -515,42 +516,58 @@ void LLInspectAvatar::toggleSelectedVoice(bool enabled)
 
 void LLInspectAvatar::updateVolumeSlider()
 {
-	// By convention, we only display and toggle voice mutes, not all mutes
-	bool is_muted = LLMuteList::getInstance()->
-						isMuted(mAvatarID, LLMute::flagVoiceChat);
-	bool voice_enabled = gVoiceClient->getVoiceEnabled(mAvatarID);
 
-	LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
-	mute_btn->setEnabled( voice_enabled );
-	mute_btn->setValue( is_muted );
+	bool voice_enabled = gVoiceClient->getVoiceEnabled(mAvatarID);
 
-	LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
-	volume_slider->setEnabled( voice_enabled && !is_muted );
-	const F32 DEFAULT_VOLUME = 0.5f;
-	F32 volume;
-	if (is_muted)
+	// Do not display volume slider and mute button if it 
+	// is ourself or we are not in a voice channel together
+	if (!voice_enabled || (mAvatarID == gAgent.getID()))
 	{
-		// it's clearer to display their volume as zero
-		volume = 0.f;
+		getChild<LLUICtrl>("mute_btn")->setVisible(false);
+		getChild<LLUICtrl>("volume_slider")->setVisible(false);
 	}
-	else if (!voice_enabled)
-	{
-		// use nominal value rather than 0
-		volume = DEFAULT_VOLUME;
-	}
-	else
+
+	else 
 	{
-		// actual volume
-		volume = gVoiceClient->getUserVolume(mAvatarID);
+		getChild<LLUICtrl>("mute_btn")->setVisible(true);
+		getChild<LLUICtrl>("volume_slider")->setVisible(true);
+
+		// By convention, we only display and toggle voice mutes, not all mutes
+		bool is_muted = LLMuteList::getInstance()->
+							isMuted(mAvatarID, LLMute::flagVoiceChat);
+
+		LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
 
-		// *HACK: Voice client doesn't have any data until user actually
-		// says something.
-		if (volume == 0.f)
+		bool is_linden = LLStringUtil::endsWith(mAvatarName, " Linden");
+
+		mute_btn->setEnabled( !is_linden);
+		mute_btn->setValue( is_muted );
+
+		LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
+		volume_slider->setEnabled( !is_muted );
+
+		const F32 DEFAULT_VOLUME = 0.5f;
+		F32 volume;
+		if (is_muted)
 		{
-			volume = DEFAULT_VOLUME;
+			// it's clearer to display their volume as zero
+			volume = 0.f;
 		}
+		else
+		{
+			// actual volume
+			volume = gVoiceClient->getUserVolume(mAvatarID);
+
+			// *HACK: Voice client doesn't have any data until user actually
+			// says something.
+			if (volume == 0.f)
+			{
+				volume = DEFAULT_VOLUME;
+			}
+		}
+		volume_slider->setValue( (F64)volume );
 	}
-	volume_slider->setValue( (F64)volume );
+
 }
 
 void LLInspectAvatar::onClickMuteVolume()