mergre

1 files changed, 2 insertions, 10 deletions

diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index 39381e3faa..8bac9937f0 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -80,8 +80,7 @@ LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)
 	mImageLevel2(p.image_level_2),
 	mImageLevel3(p.image_level_3),
 	mAutoUpdate(p.auto_update),
-	mSpeakerId(p.speaker_id),
-	mIsAgentControl(false)
+	mSpeakerId(p.speaker_id)
 {
 	//static LLUIColor output_monitor_muted_color = LLUIColorTable::instance().getColor("OutputMonitorMutedColor", LLColor4::orange);
 	//static LLUIColor output_monitor_overdriven_color = LLUIColorTable::instance().getColor("OutputMonitorOverdrivenColor", LLColor4::red);
@@ -133,14 +132,7 @@ void LLOutputMonitorCtrl::draw()
 	if (getVisible() && mAutoUpdate && !mIsMuted && mSpeakerId.notNull())
 	{
 		setPower(gVoiceClient->getCurrentPower(mSpeakerId));
-		if(mIsAgentControl)
-		{
-			setIsTalking(gVoiceClient->getUserPTTState());
-		}
-		else
-		{
-			setIsTalking(gVoiceClient->getIsSpeaking(mSpeakerId));
-		}
+		setIsTalking(gVoiceClient->getIsSpeaking(mSpeakerId));
 	}
 
 	LLPointer<LLUIImage> icon;