diff options
author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-12-12 19:05:40 +0200 |
---|---|---|
committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-12-12 19:05:40 +0200 |
commit | 322fb006306524481ee09e88a079457b86fcd95a (patch) | |
tree | dbecaae8a4553b7a3887880493659e9e874d7ea1 /indra | |
parent | 9275379e3ce20f6a27341e595481ce57c3a6b954 (diff) |
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.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 7 |
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); } |