diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-25 14:17:10 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-25 14:17:10 -0700 |
| commit | 7127ea071922ee703cab56439a379f475cd5e4e7 (patch) | |
| tree | 051012dfefb7de114b025d21d45a04f905bb7b32 | |
| parent | 63548b973e6de392f2bf209b3405b1dde78bda03 (diff) | |
CHUI-449: Post code review with Merov, adjusted setConvItemSelect() fuction to be called selectConversation().
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llimfloatercontainer.h | 2 |
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(); |