From c893c55d8a1328a134c956b70e6fef7fd7053d47 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Thu, 18 Nov 2010 17:03:01 -0800
Subject: Fixing bugs discovered in merge with viewer development

---
 indra/newview/llspeakbutton.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp
index 3dce66f394..c76ecae4a2 100644
--- a/indra/newview/llspeakbutton.cpp
+++ b/indra/newview/llspeakbutton.cpp
@@ -134,8 +134,11 @@ LLSpeakButton::LLSpeakButton(const Params& p)
 
 LLSpeakButton::~LLSpeakButton()
 {
-	LLTransientFloaterMgr::getInstance()->removeControlView(mSpeakBtn);
-	LLTransientFloaterMgr::getInstance()->removeControlView(mShowBtn);
+	if(LLTransientFloaterMgr::instanceExists())
+	{
+		LLTransientFloaterMgr::getInstance()->removeControlView(mSpeakBtn);
+		LLTransientFloaterMgr::getInstance()->removeControlView(mShowBtn);
+	}
 }
 
 void LLSpeakButton::setSpeakToolTip(const std::string& msg)
-- 
cgit v1.2.3


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