CHUI-449: Post code review with Merov, adjusted setConvItemSelect() fuction to be called selectConversation().

2 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index ebb732b995..bd7d570154 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -104,7 +104,7 @@ void LLIMFloaterContainer::sessionAdded(const LLUUID& session_id, const std::str
 
 void LLIMFloaterContainer::sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id)
 {
-    setConvItemSelect(session_id);
+    selectConversation(session_id);
 }
 
 void LLIMFloaterContainer::sessionVoiceOrIMStarted(const LLUUID& session_id)
@@ -1092,11 +1092,11 @@ bool LLIMFloaterContainer::checkContextMenuItem(const LLSD& userdata)
 void LLIMFloaterContainer::showConversation(const LLUUID& session_id)
 {
     setVisibleAndFrontmost(false);
-    setConvItemSelect(session_id);    
+    selectConversation(session_id);    
 }
 
 //Will select only the conversation item
-void LLIMFloaterContainer::setConvItemSelect(const LLUUID& session_id)
+void LLIMFloaterContainer::selectConversation(const LLUUID& session_id)
 {
 	LLFolderViewItem* widget = mConversationsWidgets[session_id];
 	if (widget)
@@ -1210,7 +1210,7 @@ void LLIMFloaterContainer::addConversationListItem(const LLUUID& uuid, bool isWi
 
 	if (isWidgetSelected)
 	{
-		setConvItemSelect(uuid);
+		selectConversation(uuid);
 	}
 	
 	// set the widget to minimized mode if conversations pane is collapsed
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h
index e69359321a..7d13b37b31 100644
--- a/indra/newview/llimfloatercontainer.h
+++ b/indra/newview/llimfloatercontainer.h
@@ -67,7 +67,7 @@ public:
 								LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
     
     void showConversation(const LLUUID& session_id);
-    void setConvItemSelect(const LLUUID& session_id);
+    void selectConversation(const LLUUID& session_id);
 	/*virtual*/ void tabClose();
 
 	static LLFloater* getCurrentVoiceFloater();