Fix release merge issues (included upstream changes not yet in release from bear)

1 files changed, 3 insertions, 4 deletions

diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 323e84751f..3d77ea4f0b 100755
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -308,8 +308,7 @@ void LLFloaterIMNearbyChat::onClose(bool app_quitting)
 }
 
 // virtual
-void LLFloaterIMNearbyChat::onClickCloseBtn(bool)
-
+void LLFloaterIMNearbyChat::onClickCloseBtn()
 {
 	if (!isTornOff())
 	{
@@ -494,11 +493,11 @@ void LLFloaterIMNearbyChat::onChatBoxKeystroke()
 			if (!rest_of_match.empty())
 			{
 				mInputEditor->setText(utf8_trigger + rest_of_match); // keep original capitalization for user-entered part
+
 				// Select to end of line, starting from the character
 				// after the last one the user typed.
-				mInputEditor->selectByCursorPosition(utf8_out_str.size()-rest_of_match.size(),utf8_out_str.size());
+				mInputEditor->selectNext(rest_of_match, false);
 			}
-
 		}
 		else if (matchChatTypeTrigger(utf8_trigger, &utf8_out_str))
 		{