diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-21 15:47:08 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-21 15:47:08 -0700 |
| commit | bd4acad1c1df22f509633f6e504c3b44880673cc (patch) | |
| tree | 1959cca80114e8e98ea367ea507e4ec46d7cb684 /indra/newview/llimfloatercontainer.cpp | |
| parent | 6dd2bf36c52fa00732ed5a3910539f38c91ff173 (diff) | |
| parent | 8b63f7f50367f5726d03fb784f5a2f0783470b9c (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rwxr-xr-x | indra/newview/llimfloatercontainer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 4e0fba9502..de1fd58661 100755 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -700,7 +700,7 @@ void LLIMFloaterContainer::repositioningWidgets() } } -void LLIMFloaterContainer::setConvItemSelect(LLUUID& session_id) +void LLIMFloaterContainer::setConvItemSelect(const LLUUID& session_id) { LLFolderViewItem* widget = mConversationsWidgets[session_id]; if (widget && mSelectedSession != session_id) @@ -763,6 +763,8 @@ void LLIMFloaterContainer::addConversationListItem(const LLUUID& uuid) participant_view->addToFolder(widget); current_participant_model++; } + + setConvItemSelect(uuid); return; } |