summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llfloaterimcontainer.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 5d41f46b3f..82bcd8efa4 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -916,7 +916,12 @@ void LLFloaterIMContainer::getParticipantUUIDs(uuid_vec_t& selected_uuids)
//Find the conversation floater associated with the selected id
const LLConversationItem * conversation_item = getCurSelectedViewModelItem();
- if(conversationItem->getType() == LLConversationItem::CONV_PARTICIPANT)
+ if (NULL == conversation_item)
+ {
+ return;
+ }
+
+ if (conversation_item->getType() == LLConversationItem::CONV_PARTICIPANT)
{
getSelectedUUIDs(selected_uuids);
}