CHUI-416 FIXED Check if conversationItem is not NULL before calling getType().

1 files changed, 11 insertions, 8 deletions

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index c4eeccecbe..14ed0b3c3e 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -927,15 +927,18 @@ void LLIMFloaterContainer::doToSelected(const LLSD& userdata)
     const LLConversationItem * conversationItem = getCurSelectedViewModelItem();
     uuid_vec_t selected_uuids;
 
-    getParticipantUUIDs(selected_uuids);
-
-    if(conversationItem->getType() == LLConversationItem::CONV_PARTICIPANT)
-    {
-        doToParticipants(command, selected_uuids);
-    }
-    else
+    if(conversationItem != NULL)
     {
-        doToSelectedConversation(command, selected_uuids);
+    	getParticipantUUIDs(selected_uuids);
+
+    	if(conversationItem->getType() == LLConversationItem::CONV_PARTICIPANT)
+    	{
+    		doToParticipants(command, selected_uuids);
+    	}
+    	else
+    	{
+    		doToSelectedConversation(command, selected_uuids);
+    	}
     }
 }