From 58ed680d530daf9852d00d33275594dc713ccdac Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 4 May 2010 20:10:29 +0200
Subject: disable speakers button and hide floateractivespeakers if voice not
 enabled.

---
 linden/indra/newview/llvoiceremotectrl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linden/indra/newview/llvoiceremotectrl.cpp')

diff --git a/linden/indra/newview/llvoiceremotectrl.cpp b/linden/indra/newview/llvoiceremotectrl.cpp
index 73d8c10..1681e96 100644
--- a/linden/indra/newview/llvoiceremotectrl.cpp
+++ b/linden/indra/newview/llvoiceremotectrl.cpp
@@ -48,6 +48,7 @@
 
 LLVoiceRemoteCtrl::LLVoiceRemoteCtrl (const std::string& name) : LLPanel(name)
 {
+	mVoiceLastActive = false;
 	setIsChrome(TRUE);
 
 	if (gSavedSettings.getBOOL("ShowVoiceChannelPopup"))
@@ -107,6 +108,11 @@ void LLVoiceRemoteCtrl::draw()
 
 	mTalkBtn->setEnabled(voice_active);
 	mTalkLockBtn->setEnabled(voice_active);
+	mSpeakersBtn->setEnabled(voice_active);
+
+	if (!voice_active && mVoiceLastActive)
+		LLFloaterActiveSpeakers::getInstance()->onClose(false);
+	mVoiceLastActive = voice_active;
 
 	// propagate ptt state to button display,
 	if (!mTalkBtn->hasMouseCapture())
-- 
cgit v1.1