diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
| commit | e040f16a4f2e50592a125a04185fd9f06ac49522 (patch) | |
| tree | 60a0e7fee37761a9278db6ab2b32f61fc38acbe1 /indra/newview/llchiclet.cpp | |
| parent | c320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff) | |
| parent | 02701073ce70fc2e2043adf0ed7e0d6879669215 (diff) | |
merge
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){ |