diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 12:09:18 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 12:09:18 -0800 |
| commit | b6edd74775e07ce392b0a1785cfc61338c890dad (patch) | |
| tree | c01e3111d3016e5f6e5453f88d8e5aa30c7ced19 /indra/newview/llchiclet.cpp | |
| parent | 1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff) | |
| parent | 8d21105a8c2b6bff98b4f3b91a614a4710d4b7ea (diff) | |
Merged latest lindenlab/viewer-development with mani_linden/viewer-development for bacground updater work.
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){ |