merge

--HG--
branch : product-engine

indra/newview/lloutputmonitorctrl.cpp

@@ -243,7 +243,8 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id)
 		}
 		else
 		{
-			setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId));
+			// check only blocking on voice. EXT-3542
+			setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat));
 			LLMuteList::getInstance()->addObserver(this);
 		}
 	}
@@ -251,5 +252,6 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id)
 
 void LLOutputMonitorCtrl::onChange()
 {
-	setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId));
+	// check only blocking on voice. EXT-3542
+	setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat));
 }

indra/newview/llpanelimcontrolpanel.cpp

@@ -194,6 +194,7 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id)
 		childSetEnabled("pay_btn", FALSE);
 
         getChild<LLTextBox>("avatar_name")->setValue(im_session->mName);
+        getChild<LLTextBox>("avatar_name")->setToolTip(im_session->mName);
 	}
 	else
 	{
@@ -217,6 +218,7 @@ void LLPanelIMControlPanel::nameUpdatedCallback(const LLUUID& id, const std::str
 		avatar_name.append(" ");
 		avatar_name.append(last);
 		getChild<LLTextBox>("avatar_name")->setValue(avatar_name);
+		getChild<LLTextBox>("avatar_name")->setToolTip(avatar_name);
 	}
 }