summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinput.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2023-08-29 03:40:10 -0700
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2023-08-29 03:40:10 -0700
commitc5bfe869154cd4708c9bca63f08cb4c958198638 (patch)
tree6f79db9976863b2c1ea0f20bbb4049ee0cc98c1c /indra/newview/llviewerinput.cpp
parentfbecd348f897ee91a5639e7e9fe4f0578d72b8e2 (diff)
parent89f2165b4170d9fddc10a55292c28750093a22a0 (diff)
Merge branch 'DRTVWR-559' into DRTVWR-583
Diffstat (limited to 'indra/newview/llviewerinput.cpp')
-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)