diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
| commit | 14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78 (patch) | |
| tree | 60f4de9fcd1b22b8dd504218a870e8abea599a81 /indra/llui/llchatentry.cpp | |
| parent | d4b3c23da11dd963915d078b169ac9ac0cf7b7bf (diff) | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
Merged lindenlab/viewer-development into default
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) |