summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 14:30:40 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 14:30:40 +0000
commit10e7b598fa1d53da0454f87ad72d0b68a1b32a81 (patch)
tree1886806d88b2b686fe67395a928f6805984d0723 /indra
parent2d7badb6047d9897c4b7e288b6c6b569b5b643e4 (diff)
CID-147
Checker: NULL_RETURNS Function: LLNotificationChannelPanel::onClickNotificationReject(void *) File: /indra/newview/llfloaternotificationsconsole.cpp
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaternotificationsconsole.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index 90db8988b2..8b110f5846 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -124,10 +124,15 @@ void LLNotificationChannelPanel::onClickNotificationReject(void* user_data)
{
LLNotificationChannelPanel* self = (LLNotificationChannelPanel*)user_data;
if (!self) return;
- void* data = self->getChild<LLScrollListCtrl>("notification_rejects_list")->getFirstSelected()->getUserdata();
- if (data)
+ LLScrollListItem* firstselected = self->getChild<LLScrollListCtrl>("notification_rejects_list")->getFirstSelected();
+ llassert(firstselected);
+ if (firstselected)
{
- gFloaterView->getParentFloater(self)->addDependentFloater(new LLFloaterNotification((LLNotification*)data), TRUE);
+ void* data = firstselected->getUserdata();
+ if (data)
+ {
+ gFloaterView->getParentFloater(self)->addDependentFloater(new LLFloaterNotification((LLNotification*)data), TRUE);
+ }
}
}