diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
| commit | e58c809a5816383674d0f1957440fad728e88893 (patch) | |
| tree | 83f1ff2c4bee8237c4557793143b2133623943a4 /indra/newview/llspeakbutton.cpp | |
| parent | f9af1f4fca028709b0262c0e8c40eefc2ab13d00 (diff) | |
| parent | e6c0615b97019cf9c8aee267513757c0c2510420 (diff) | |
merge changes for STORM-1131
Diffstat (limited to 'indra/newview/llspeakbutton.cpp')
| -rw-r--r-- | indra/newview/llspeakbutton.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp index 3dce66f394..d52e0a6c86 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"); @@ -134,8 +135,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) @@ -173,6 +177,7 @@ 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() { |