summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimnearbychat.cpp
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2013-11-19 16:56:17 -0500
committerJonathan Yap <none@none>2013-11-19 16:56:17 -0500
commit410a084f9a2e030efda635f5a51280b599ab7f78 (patch)
tree2c2f095cee8cf0b233d59eee2c8d99ad68c44c70 /indra/newview/llfloaterimnearbychat.cpp
parentdad992ea31b6b823c316400e61d50d1aa9e52330 (diff)
parentfcc885d4fc5ef63dad33e89a9324edc39d466d37 (diff)
STORM-1980 Merge changes Oz made (new way of detecting an agent has changed regions)
Modify code to make use of the changed callback
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
-rwxr-xr-xindra/newview/llfloaterimnearbychat.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 3d77ea4f0b..323e84751f 100755
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -308,7 +308,8 @@ void LLFloaterIMNearbyChat::onClose(bool app_quitting)
}
// virtual
-void LLFloaterIMNearbyChat::onClickCloseBtn()
+void LLFloaterIMNearbyChat::onClickCloseBtn(bool)
+
{
if (!isTornOff())
{
@@ -493,11 +494,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->selectNext(rest_of_match, false);
+ mInputEditor->selectByCursorPosition(utf8_out_str.size()-rest_of_match.size(),utf8_out_str.size());
}
+
}
else if (matchChatTypeTrigger(utf8_trigger, &utf8_out_str))
{