diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:02:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:02:54 +0100 |
| commit | 06884cf1371d4c1ee02d337242e46b0f3bbe8837 (patch) | |
| tree | 9255ad9db22916ae0add7cae37705e58aa9c465e /indra/llui/lltexteditor.cpp | |
| parent | 663d8f7870c2858956aea8ab20129fd084a96dc8 (diff) | |
| parent | d69084d5d86d551adbc9721276aa60959b7d7899 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index a1cae4bb98..4fd62045e8 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -713,7 +713,8 @@ BOOL LLTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) { setFocus(TRUE); } - if (!LLTextBase::handleRightMouseDown(x, y, mask)) + // Prefer editor menu if it has selection. See EXT-6806. + if (hasSelection() || !LLTextBase::handleRightMouseDown(x, y, mask)) { if(getShowContextMenu()) { |