diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 10:26:11 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 10:26:11 -0400 |
| commit | 70a13fb3227469179ef388d95879667361ef5c03 (patch) | |
| tree | b3d8cbb5b2577563489c0be6c145913696b45b4d /indra/llui/lltexteditor.cpp | |
| parent | c5e338f240422cc10d0e90c514a427c9ec4a1bd3 (diff) | |
| parent | 3f10caafc07b0d1a60d2b943684e87dec265f5bc (diff) | |
merge
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()) { |