summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolcomp.cpp
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2022-03-07 00:19:11 -0800
committerBrad Kittenbrink <brad@lindenlab.com>2022-03-07 00:19:11 -0800
commit89ab1e4525445d5efc370c381f7c1e18faab8f16 (patch)
tree3e1326470eddea3310bfd15867c9d54dd3b1652c /indra/newview/lltoolcomp.cpp
parent40b80251e48d5f0ae3695d9019261f9e472f3e16 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
Diffstat (limited to 'indra/newview/lltoolcomp.cpp')
-rw-r--r--indra/newview/lltoolcomp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index f9c327b46e..ba328f27c4 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -343,7 +343,9 @@ BOOL LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
}
// Nothing selected means the first mouse click was probably
// bad, so try again.
- return FALSE;
+ // This also consumes the event to prevent things like double-click
+ // teleport from triggering.
+ return handleMouseDown(x, y, mask);
}