diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-19 12:53:59 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-19 12:53:59 -0700 |
| commit | 5f80e5681c7a0e9f0fc5889ede435c79358fc639 (patch) | |
| tree | ee9e5826ee220a971aa7990ef83a64644bf644d9 /indra/llui/lltexteditor.cpp | |
| parent | a1a43f7942f68e75eaadaa9c5280ac196c4ed6a7 (diff) | |
| parent | 7f0a7789903809d489e9f85575be18c88df1ea98 (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()) { |