summaryrefslogtreecommitdiff
path: root/indra/newview/llscriptfloater.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2012-01-04 13:14:03 -0500
committerprep <prep@lindenlab.com>2012-01-04 13:14:03 -0500
commitce49cbc00e9f6ed8fe43c913b02669103fbb1472 (patch)
treeb192267f163d6059c7b74824c9254f51223dd2c4 /indra/newview/llscriptfloater.cpp
parent06bfbf61e16ffec0e54f131a7f3b37c475f10cd9 (diff)
parent3fd7752f1289f67db93e76833cc9804d057bc3c8 (diff)
merge
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
-rw-r--r--indra/newview/llscriptfloater.cpp11
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);