diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-01-03 10:38:06 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-03 10:38:06 -0800 |
| commit | 3fd7752f1289f67db93e76833cc9804d057bc3c8 (patch) | |
| tree | 4fe65b7a3c80b065aa19e4904ea8e0d0d0e56940 /indra/newview/llscriptfloater.cpp | |
| parent | d1e79837d1b07cec0297a20e3cb63a47b136d844 (diff) | |
| parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
| -rw-r--r-- | indra/newview/llscriptfloater.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index 85a7e75271..6f98be1cb8 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -408,9 +408,16 @@ void LLScriptFloaterManager::onRemoveNotification(const LLUUID& notification_id) } // remove related chiclet - LLChicletBar::getInstance()->getChicletPanel()->removeChiclet(notification_id); + if (LLChicletBar::instanceExists()) + { + LLChicletBar::getInstance()->getChicletPanel()->removeChiclet(notification_id); + } - LLIMWellWindow::getInstance()->removeObjectRow(notification_id); + LLIMWellWindow* im_well_window = LLIMWellWindow::findInstance(); + if (im_well_window) + { + im_well_window->removeObjectRow(notification_id); + } mNotifications.erase(notification_id); |