diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-21 17:58:30 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-21 17:58:30 -0500 |
| commit | 7c0b98aa83faacf27da2b71e186399e232a1a376 (patch) | |
| tree | 3224b7f2ba4b7541610b927093f80f679707aa92 /indra/newview/llscriptfloater.cpp | |
| parent | ef08cd9dc619f692ce4e13ba1268c117a75ab2bf (diff) | |
| parent | 55f1d95d978dd6ac38c9f77882399323567fb634 (diff) | |
merge
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); |