diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 16:23:24 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 16:23:24 -0500 |
| commit | 2b5a3de8096fa9a4e8c523aab22493adf7411d3f (patch) | |
| tree | 319b05acdff8b3eae2999e5c24855d21e905c78f /indra/llui/lltexteditor.cpp | |
| parent | a165279acd57c6c0e2e6492b7de39a9e614327af (diff) | |
| parent | 21adf86c567d3cad81e762c0215c8ec8f8c5eab6 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 62aeb50011..3fdb48b3ca 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -720,7 +720,10 @@ BOOL LLTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) } if (!LLTextBase::handleRightMouseDown(x, y, mask)) { - showContextMenu(x, y); + if(getMouseOpaque()) + { + showContextMenu(x, y); + } } return TRUE; } |