diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:21:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:21:12 -0500 |
| commit | 570d562f5871f40bd7f8c683db5316ffd0133335 (patch) | |
| tree | ff29baa075e3de2030bfad8755be6ef261691416 /indra/newview/llscriptfloater.cpp | |
| parent | b022ebf13c9a227f87a112419e237894a1231c8c (diff) | |
| parent | 55f1d95d978dd6ac38c9f77882399323567fb634 (diff) | |
merge changes for vmrg-209 and vmrg-210 back from beta branch
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); |