diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
commit | 7a74f64d5eda050da0d966b0fa3e76b4b54888fa (patch) | |
tree | b3cee2fdcf01e11cf13dca58f56c3b1d0e804739 /indra/newview/llspeakbutton.cpp | |
parent | b48dad17260a7f5fbfc4d0548b4386d62efc2e5e (diff) | |
parent | 9d3174c0386e6eefba1949075971ce7f75571394 (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) |