diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-04 14:43:29 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-04 14:43:29 -0500 |
| commit | a93eb24e39458576475482b50ee0016fc4df50f9 (patch) | |
| tree | b9f5287712f154215695c5152f3d24c391ca2ae7 /indra/llui/lltexteditor.cpp | |
| parent | c58e152236abfc1c414eb6c64783334ca9555b58 (diff) | |
| parent | fed6c9eb0fa58559c13729b65ecee181f58f3c69 (diff) | |
automated merge viewer2.0->viewer2.0
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; } |