diff options
| author | Tofu Buzzard <no-email> | 2010-11-27 13:08:00 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-11-27 13:08:00 +0000 |
| commit | 31a109452d743af565f99029ec835e2f32261681 (patch) | |
| tree | 07375d9174730e1deec3aedcc6333fe8426cd827 /indra/newview/llchiclet.cpp | |
| parent | b3541777921142572f735c4b028e4fba91ae80a0 (diff) | |
| parent | 2f83766bb71772eda19a4c7c61896c0fd7fae8a4 (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){ |