summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinput.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-08-24 07:37:50 +0800
committerErik Kundiman <erik@megapahit.org>2023-08-24 07:37:50 +0800
commit7f354c70ba623b591c36dadd0f6616b349be4fc7 (patch)
tree67557a9981877e6e4b1f08937dfde94e6287dc61 /indra/newview/llviewerinput.cpp
parent5b9cb5bba3c12b1b5c86ba56d43ccf06b83edc14 (diff)
parent33e0766ee08cccb480675a75d83b3a6e78849906 (diff)
Merge tag '6.6.14-release'
source for viewer 6.6.14.581101
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)