diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2010-04-16 13:31:06 +0300 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2010-04-16 13:31:06 +0300 |
| commit | 5f49061661a401980aa89195995bfb165b33ff12 (patch) | |
| tree | 810c2bac0a98f167ad7537d15e4754d11b3823c3 /indra | |
| parent | 4e4dd52753523afcedc4af357a280defd1cb9070 (diff) | |
Fixed normal bug EXT-6806 (Context menu conflict: selected text vs group) - prefer text menu if it has selection.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/245/.
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -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()) { |