disable speakers button and hide floateractivespeakers if voice not enabled.

1 files changed, 6 insertions, 0 deletions

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())