diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 21:57:27 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 21:57:27 -0800 |
| commit | 8c2026d6b71f133deafa6b0e19baf69632a2510a (patch) | |
| tree | 580083310e6298a8b68aba59a566d18a970d6fbb /indra/newview/llchiclet.cpp | |
| parent | e19ee531aedcbbe0f77a8ac11cdcda43c9c4ed84 (diff) | |
CHOP-135 Bug fixes.
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 8f385160e9..885d553524 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -1092,9 +1092,11 @@ LLChicletPanel::LLChicletPanel(const Params&p) LLChicletPanel::~LLChicletPanel() { - LLTransientFloaterMgr::getInstance()->removeControlView(mLeftScrollButton); - LLTransientFloaterMgr::getInstance()->removeControlView(mRightScrollButton); - + if(LLTransientFloaterMgr::instanceExists()) + { + LLTransientFloaterMgr::getInstance()->removeControlView(mLeftScrollButton); + LLTransientFloaterMgr::getInstance()->removeControlView(mRightScrollButton); + } } void im_chiclet_callback(LLChicletPanel* panel, const LLSD& data){ |