diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
| commit | df3e6b40fd80a139e745106231bc5c752271beea (patch) | |
| tree | c52227a2428060c5f3ffd7a1f97725c45adedb3a /indra/llui/lltexteditor.cpp | |
| parent | 8192a3c5b2addd63e1d5c12269eec7e6de2adde0 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
merge changes for 3.7.12-release
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rwxr-xr-x | indra/llui/lltexteditor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 90e3606998..576e8f7600 100755 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -260,7 +260,8 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) : mContextMenu(NULL), mShowContextMenu(p.show_context_menu), mEnableTooltipPaste(p.enable_tooltip_paste), - mPassDelete(FALSE) + mPassDelete(FALSE), + mKeepSelectionOnReturn(false) { mSourceID.generate(); @@ -1653,7 +1654,7 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask) case KEY_RETURN: if (mask == MASK_NONE) { - if( hasSelection() ) + if( hasSelection() && !mKeepSelectionOnReturn ) { deleteSelection(FALSE); } |