CHUI-102: Code review, just changed function getCurSelectedViewModelItem() to have a single return statement.

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 11aecde6e2..a33fc2c57e 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -737,14 +737,16 @@ void LLIMFloaterContainer::getSelectedUUIDs(uuid_vec_t& selected_uuids)
 
 const LLConversationItem * LLIMFloaterContainer::getCurSelectedViewModelItem()
 {
+    LLConversationItem * conversationItem = NULL;
+
     if(mConversationsRoot && 
         mConversationsRoot->getCurSelectedItem() && 
         mConversationsRoot->getCurSelectedItem()->getViewModelItem())
     {
-        return static_cast<LLConversationItem *>(mConversationsRoot->getCurSelectedItem()->getViewModelItem());
+        conversationItem = static_cast<LLConversationItem *>(mConversationsRoot->getCurSelectedItem()->getViewModelItem());
     }
 
-    return NULL;
+    return conversationItem;
 }
 
 void LLIMFloaterContainer::doToUsers(const std::string& command, uuid_vec_t selectedIDS)