diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-08-06 09:22:43 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-08-06 09:22:43 -0700 |
| commit | 81c342dfa9ac04378e22c76f119408e6e00c0f13 (patch) | |
| tree | 728de42a95d436d7a753bf3884d683d4201b5ad0 /indra/llui/lltexteditor.cpp | |
| parent | 3b2f456416d29534cb41fc9d4ad3bf195dcfc847 (diff) | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Merge with 3.7.13-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); } |