diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-12-15 18:28:43 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-12-15 18:28:43 +0800 |
| commit | 91b49c8bfa061f3d3b8601d5398b1889a9e31850 (patch) | |
| tree | 98adc151491a2bee51a70cf7dd37de21d4f32bb3 /indra/llui/lllineeditor.cpp | |
| parent | 0cce0b8149e049161ab17f1c608ded2d6cc12b0e (diff) | |
| parent | a80e3fe4191aee87c566937953d52fa6498b7f32 (diff) | |
Merge tag '7.1.1-release'
source for viewer 7.1.1.7039128750
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 940cf398c0..60dbfd68c6 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -164,7 +164,8 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) mHighlightColor(p.highlight_color()), mPreeditBgColor(p.preedit_bg_color()), mGLFont(p.font), - mContextMenuHandle() + mContextMenuHandle(), + mShowContextMenu(true) { llassert( mMaxLengthBytes > 0 ); @@ -825,7 +826,7 @@ BOOL LLLineEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask) BOOL LLLineEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) { setFocus(TRUE); - if (!LLUICtrl::handleRightMouseDown(x, y, mask)) + if (!LLUICtrl::handleRightMouseDown(x, y, mask) && getShowContextMenu()) { showContextMenu(x, y); } |