Pull merge from richard/viewer-chui

1 files changed, 18 insertions, 5 deletions

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