Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0

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
@@ -518,13 +518,17 @@ void LLInspectAvatar::updateVolumeSlider()
 	bool is_muted = LLMuteList::getInstance()->
 						isMuted(mAvatarID, LLMute::flagVoiceChat);
 	bool voice_enabled = gVoiceClient->getVoiceEnabled(mAvatarID);
+	bool is_self = (mAvatarID == gAgent.getID());
 
 	LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
 	mute_btn->setEnabled( voice_enabled );
 	mute_btn->setValue( is_muted );
+	mute_btn->setVisible( voice_enabled && !is_self );
 
 	LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
 	volume_slider->setEnabled( voice_enabled && !is_muted );
+	volume_slider->setVisible( voice_enabled && !is_self );
+
 	const F32 DEFAULT_VOLUME = 0.5f;
 	F32 volume;
 	if (is_muted)