diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-04 09:59:57 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-04 09:59:57 -0500 |
| commit | a3e30250e8dc16d976e1df5d50bfdca28aec6d7e (patch) | |
| tree | 6269e0d5a461c4cde9cc07f2d1f54a1eb3f4e036 /indra/newview/llscriptfloater.cpp | |
| parent | 1620ad6d00a77b2089e0ae5f6de30f9a954c6167 (diff) | |
| parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (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); |