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.

1 files changed, 7 insertions, 0 deletions

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<LLConversationItem*>(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();
 }