diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 17:03:40 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 17:03:40 -0800 |
| commit | e19ee531aedcbbe0f77a8ac11cdcda43c9c4ed84 (patch) | |
| tree | 1c297e01c91d9aa851296cf371403daa0a243988 /indra/newview/llspeakbutton.cpp | |
| parent | cd30239eda5d8969db02c2c56d95332dd5039bb0 (diff) | |
| parent | c893c55d8a1328a134c956b70e6fef7fd7053d47 (diff) | |
merge
Diffstat (limited to 'indra/newview/llspeakbutton.cpp')
| -rw-r--r-- | indra/newview/llspeakbutton.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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) |