summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-07-17 23:17:49 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-07-17 23:17:49 +0300
commit4c141cc4c508d04bb511cead0b5256fccda547e6 (patch)
tree86410e112f289d6cac3c56ba138a5132b3e6f1d8 /indra/newview
parent07ff9a5d67cefdae1bc112b19947f7ba173c9dbb (diff)
parent68a064431c6a5d3339727e7c58fcf338cf5d413f (diff)
Merge branch 'DRTVWR-580-maint-T' into DRTVWR-582-maint-U
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerinput.cpp4
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)