Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.

1 files changed, 0 insertions, 24 deletions

diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 527c0ad233..71d668d047 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -341,14 +341,6 @@ void LLConversationViewSession::onCurrentVoiceSessionChanged(const LLUUID& sessi
 	if (vmi)
 	{
 		bool is_active = vmi->getUUID() == session_id;
-		bool is_nearby = vmi->getType() == LLConversationItem::CONV_SESSION_NEARBY;
-
-		if (is_nearby)
-		{
-			mSpeakingIndicator->setSpeakerId(is_active ? gAgentID : LLUUID::null);
-		}
-
-		mSpeakingIndicator->switchIndicator(is_active);
 		mCallIconLayoutPanel->setVisible(is_active);
 	}
 }
@@ -409,7 +401,6 @@ BOOL LLConversationViewParticipant::postBuild()
 	mInfoBtn->setClickedCallback(boost::bind(&LLConversationViewParticipant::onInfoBtnClick, this));
 	mInfoBtn->setVisible(false);
 
-	mActiveVoiceChannelConnection = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLConversationViewParticipant::onCurrentVoiceSessionChanged, this, _1));
 	mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
 
     if (!sStaticInitialized)
@@ -479,21 +470,6 @@ S32 LLConversationViewParticipant::arrange(S32* width, S32* height)
     return arranged;
 }
 
-void LLConversationViewParticipant::onCurrentVoiceSessionChanged(const LLUUID& session_id)
-{
-	LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>(getViewModelItem());
-	
-	if (participant_model)
-	{
-		LLConversationItemSession* parent_session = participant_model->getParentSession();
-		if (parent_session)
-		{
-			bool is_active = (parent_session->getUUID() == session_id);
-			mSpeakingIndicator->switchIndicator(is_active);
-		}
-	}
-}
-
 void LLConversationViewParticipant::refresh()
 {
 	// Refresh the participant view from its model data