From d0f9600f37a87b2d6c7a2c3cfbbc5d793e505872 Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Mon, 15 Oct 2012 16:06:02 -0700 Subject: CHUI-380: Bug fix after merge. When selecting the participant of a conversation focus would be lost on the converstation floater. This was because focus would be set to the participant folder item. Resolution: Now delegate focus from the particiapnt folder item to the conversation floater. --- indra/newview/llconversationview.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 637f30635e..b7ebb70e86 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -425,6 +425,7 @@ void LLConversationViewParticipant::selectItem() { LLConversationItem* vmi = this->getParentFolder() ? static_cast(this->getParentFolder()->getViewModelItem()) : NULL; LLIMFloaterContainer* container = LLIMFloaterContainer::getInstance(); + LLFloater* session_floater; //Only execute when switching floaters (conversations) if(vmi && vmi->getUUID() != container->getSelectedSession()) @@ -441,6 +442,12 @@ void LLConversationViewParticipant::selectItem() LLIMFloater::show(vmi->getUUID()); } } + //Focus the current conversation floater (it is already visible so just focus it) + else + { + session_floater = LLIMConversation::getConversation(vmi->getUUID()); + session_floater->setFocus(TRUE); + } LLFolderViewItem::selectItem(); } -- cgit v1.2.3