From aa628750eb4f465c328b272f7c2db3bc7b48d654 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 24 Mar 2011 12:07:47 -0400
Subject: STORM-1077 Change hint wording.  Disable hint if speak or flyout
 button is pressed.

---
 indra/newview/llspeakbutton.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llspeakbutton.cpp')

diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp
index c76ecae4a2..81beb0155f 100644
--- a/indra/newview/llspeakbutton.cpp
+++ b/indra/newview/llspeakbutton.cpp
@@ -38,6 +38,7 @@
 #include "llspeakbutton.h"
 
 #include "llbottomtray.h"
+#include "llfirstuse.h"
 
 static LLDefaultChildRegistry::Register<LLSpeakButton> t1("talk_button");
 
@@ -176,10 +177,12 @@ void LLSpeakButton::onMouseDown_SpeakBtn()
 {
 	bool down = true;
 	LLVoiceClient::getInstance()->inputUserControlState(down); // this method knows/care about whether this translates into a toggle-to-talk or down-to-talk
+	LLFirstUse::speak(false);
 }
 void LLSpeakButton::onMouseUp_SpeakBtn()
 {
 	bool down = false;
 	LLVoiceClient::getInstance()->inputUserControlState(down);
+	LLFirstUse::speak(false);
 }
 
-- 
cgit v1.2.3


From 32012f9fd4e9a5cb37f3a91d79873b79b9e6531e Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 24 Mar 2011 13:57:57 -0400
Subject: STORM-1077 Removed disabling speak hint on mouse up of speak button

---
 indra/newview/llspeakbutton.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/llspeakbutton.cpp')

diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp
index 81beb0155f..d52e0a6c86 100644
--- a/indra/newview/llspeakbutton.cpp
+++ b/indra/newview/llspeakbutton.cpp
@@ -183,6 +183,5 @@ void LLSpeakButton::onMouseUp_SpeakBtn()
 {
 	bool down = false;
 	LLVoiceClient::getInstance()->inputUserControlState(down);
-	LLFirstUse::speak(false);
 }
 
-- 
cgit v1.2.3


From 5fe3675564f1c7d8cf13e94f43d32be5ea45940b Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 29 Apr 2011 15:53:14 -0700
Subject: EXP-761, EXP-758

---
 indra/newview/llspeakbutton.cpp | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'indra/newview/llspeakbutton.cpp')

diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp
index d52e0a6c86..d3e96f8dfb 100644
--- a/indra/newview/llspeakbutton.cpp
+++ b/indra/newview/llspeakbutton.cpp
@@ -54,26 +54,6 @@ LLSpeakButton::Params::Params()
 	// See widgets/talk_button.xml
 }
 
-void LLSpeakButton::draw()
-{
-	// LLVoiceClient::getInstance() is the authoritative global source of info regarding our open-mic state, we merely reflect that state.
-	bool openmic = LLVoiceClient::getInstance()->getUserPTTState();
-	bool voiceenabled = LLVoiceClient::getInstance()->voiceEnabled();
-	mSpeakBtn->setToggleState(openmic && voiceenabled);
-	mOutputMonitor->setIsMuted(!voiceenabled);
-	LLUICtrl::draw();
-}
-void LLSpeakButton::setSpeakBtnEnabled(bool enabled)
-{
-	LLButton* speak_btn = getChild<LLButton>("speak_btn");
-	speak_btn->setEnabled(enabled);
-}
-void LLSpeakButton::setFlyoutBtnEnabled(bool enabled)
-{
-	LLButton* show_btn = getChild<LLBottomtrayButton>("speak_flyout_btn");
-	show_btn->setEnabled(enabled);
-}
-
 LLSpeakButton::LLSpeakButton(const Params& p)
 : LLUICtrl(p)
 , mOutputMonitor(NULL)
-- 
cgit v1.2.3