diff options
| author | merov_linden <none@none> | 2013-03-11 14:59:53 -0700 |
|---|---|---|
| committer | merov_linden <none@none> | 2013-03-11 14:59:53 -0700 |
| commit | e5aa9088f01f8689e19be82e3caa56fffbab85c1 (patch) | |
| tree | d252406f96d6a7a0c1b37a6a3bbcef96aea8de69 | |
| parent | 9fb00841669ed75479b57cccaa124747d09bbf97 (diff) | |
CHUI-810 : Merged Marine Kelley's patch on selected text and use of return key in chat
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llui/llchatentry.cpp | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 10c935f9bb..32dd3c1a2e 100644 --- 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 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) |