diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:39:49 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:39:49 +0100 |
| commit | 689fdd553c38ddef9c33f90c0b408bb2e9299742 (patch) | |
| tree | b64aae5890112fe3c14c86acddc66cd872dcf223 /indra/llui/lltexteditor.cpp | |
| parent | 14f3b77b9c4103f324d24625bd30dd106ab1817f (diff) | |
| parent | 3f10caafc07b0d1a60d2b943684e87dec265f5bc (diff) | |
merge from 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()) { |