From 2ea750ebcad8335aeb0ec77a483831b62d05f643 Mon Sep 17 00:00:00 2001 From: "Graham Madarasz (Graham)" Date: Tue, 5 Mar 2013 13:47:02 -0800 Subject: For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index e86ef11a72..10c935f9bb 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -748,6 +748,7 @@ Marine Kelley MartinRJ Fayray STORM-1844 STORM-1845 + STORM-1934 Matthew Anthony Matthew Dowd VWR-1344 -- cgit v1.3 From e5aa9088f01f8689e19be82e3caa56fffbab85c1 Mon Sep 17 00:00:00 2001 From: merov_linden Date: Mon, 11 Mar 2013 14:59:53 -0700 Subject: CHUI-810 : Merged Marine Kelley's patch on selected text and use of return key in chat --- doc/contributions.txt | 1 + indra/llui/llchatentry.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) (limited to 'doc') 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) -- cgit v1.3