CHUI-380: Fixing a bug that occurred when right clicking nearby chat and then right clicking a participant under a conversation. This would result in both the participant and conversation to be highlighted. Still a work in progress. This change involves introducing an old bug CHUI 289 and finding a different approach to solving it.

1 files changed, 8 insertions, 7 deletions

diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index a0ddc9b52b..a89ae4a2dc 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -274,23 +274,24 @@ void LLNearbyChat::removeScreenChat()
 void LLNearbyChat::setFocus(BOOL focusFlag)
 {
     LLTransientDockableFloater::setFocus(focusFlag);
-
+    
     //Redirect focus to input editor
     if (focusFlag)
     {
         mInputEditor->setFocus(TRUE);
     }
+    
 }
 
 void	LLNearbyChat::setVisible(BOOL visible)
 {
-	if(visible)
-	{
-		removeScreenChat();
-        setFocus(TRUE);
-	}
-
 	LLIMConversation::setVisible(visible);
+
+    if(visible)
+    {
+        removeScreenChat();
+    }
+    setFocus(visible);
 }