diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-12 07:39:00 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-12 07:39:00 +0200 |
| commit | cca679e0d66caf0aa49a77a89f821f923d4ead59 (patch) | |
| tree | 84d8e15d3422849305c65774b823758e56d7d085 /indra/llui/llchatentry.cpp | |
| parent | 40f61ae60091909bae8229b7d0496154a87fefbf (diff) | |
| parent | 130c11c9fe9edc315229f30c338698f0463d0ee4 (diff) | |
merge
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) |