From 322fb006306524481ee09e88a079457b86fcd95a Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Wed, 12 Dec 2012 19:05:40 +0200 Subject: CHUI-584 : Fixed : Viewer crash when clicking on view/sort options drop down in conversation floater: Protection from a lack of the current selection. It need for the newly created floater, which still is not finished adding the first conversation item. --- indra/newview/llfloaterimcontainer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra') 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); } -- cgit v1.2.3