diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-21 17:52:03 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-21 17:52:03 +0300 |
| commit | 073065d6520a3b438fce3c5c27ee51c6d86ee742 (patch) | |
| tree | 508043f7064b909c32ad890b71050f4edf0738d2 /indra | |
| parent | fcb010e835d9b894ba6d1012ac8e3a85c5ab3400 (diff) | |
CHUI-289 ADD. FIX (Newly added conversation is not selected in conversation list): Select item which was added from avatar picker
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/llimfloatercontainer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llimfloatercontainer.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index a2efe63546..d5bce5a43f 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -54,6 +54,7 @@ LLIMConversation::LLIMConversation(const LLUUID& session_id) , mInputEditor(NULL) , mInputEditorTopPad(0) , mRefreshTimer(new LLTimer()) + , mHaveFocus(false) { mSession = LLIMModel::getInstance()->findIMSession(mSessionID); 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; } diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index 1f526091bb..077ecd192b 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -62,7 +62,7 @@ public: /*virtual*/ void addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END); - void setConvItemSelect(LLUUID& session_id); + void setConvItemSelect(const LLUUID& session_id); /*virtual*/ void tabClose(); static LLFloater* getCurrentVoiceFloater(); |