diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-26 11:32:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-26 11:32:31 -0400 |
| commit | e917620069ce20c30c1abb53c5ece847ee76ddba (patch) | |
| tree | 31e85be6bd0b0177ab56ae8dfeef1dfff15d19c5 /indra/llui/llchatentry.cpp | |
| parent | 70ae613209bdc03f7ff45075e673e225447ec7a5 (diff) | |
| parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
merge changes for 3.5.0-beta5
Diffstat (limited to 'indra/llui/llchatentry.cpp')
| -rw-r--r-- | indra/llui/llchatentry.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp index 8e9c6555c3..9e48dcde7e 100644 --- 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) |