diff options
author | RunitaiLinden <davep@lindenlab.com> | 2023-09-11 11:51:20 -0500 |
---|---|---|
committer | RunitaiLinden <davep@lindenlab.com> | 2023-09-11 11:51:20 -0500 |
commit | 74940194fa5cd4c5182f141ef262e5568156bdce (patch) | |
tree | 8d3a8e779d34a94b4df3dc4517dfa598b4b98367 /indra/newview/llviewerinput.cpp | |
parent | e3e1d42ab3021cf6e6ac68fff54c9185fd3a0ad1 (diff) | |
parent | 0b02bf5d262fe9a6de968686420c4d525ac04077 (diff) |
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into davep/SL-19842
Diffstat (limited to 'indra/newview/llviewerinput.cpp')
-rw-r--r-- | indra/newview/llviewerinput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp index 226e0a9a56..7207d6c6ba 100644 --- a/indra/newview/llviewerinput.cpp +++ b/indra/newview/llviewerinput.cpp @@ -1617,9 +1617,9 @@ BOOL LLViewerInput::handleMouse(LLWindow *window_impl, LLCoordGL pos, MASK mask, // If the first LMB click is handled by the menu, skip the following double click static bool skip_double_click = false; - if (clicktype == CLICK_LEFT && down && !is_toolmgr_action) + if (clicktype == CLICK_LEFT && down) { - skip_double_click = handled; + skip_double_click = is_toolmgr_action ? false : handled; } if (double_click_sp && down) |