diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-13 19:09:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 19:09:00 -0400 |
| commit | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (patch) | |
| tree | 85a0f5fef2af8276cf99388a46193624838dfb6b /indra/llui/llchatentry.cpp | |
| parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
merge changes for 3.5.0-beta3
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) |