CHUI-810 : Merged Marine Kelley's patch on selected text and use of return key in chat

2013-03-11 14:59:53 -07:00 · 2013-03-11 14:59:53 -07:00 · e5aa9088f0
parent 9fb0084166
commit e5aa9088f0
2 changed files with 10 additions and 0 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -744,6 +744,7 @@ Marc Claridge
 Marc2 Sands
 Marianne McCann
 Marine Kelley
+    CHUIBUG-134
    STORM-281
 MartinRJ Fayray
    STORM-1844
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@ -169,6 +169,15 @@ BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)
 {
 	BOOL handled = FALSE;

+    // In the case of a chat entry, pressing RETURN when something is selected
+    // should NOT erase the selection (unlike a notecard, for example)
+    if (key == KEY_RETURN)
+    {
+        endOfDoc();
+        startSelection();
+        endSelection();
+    }
+
 	LLTextEditor::handleSpecialKey(key, mask);

 	switch(key)