diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-07-09 14:32:46 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-07-09 14:32:46 -0400 |
| commit | ff3827f278d2d53f565bc585edc4db5bc5e5dc38 (patch) | |
| tree | 87ba73e79aeb4af20816755f4226acdb942280c6 /indra/llui/lltexteditor.cpp | |
| parent | bfb9fc85b9c8b59d5cddced665d8be2e6907b455 (diff) | |
| parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) | |
merge
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); } |