diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:17:09 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:17:09 -0400 |
| commit | 2e144ecbb2cc7676cfb9f5ab46a2f63c8af85d85 (patch) | |
| tree | 0296876c167d0bec11434394157b4a5b1c0b63a5 /indra/llui/lltoolbar.cpp | |
| parent | 1b5f0590ce45ce6e540d266a8902af5839885cfb (diff) | |
| parent | 33ad8db77584c66496f261a1cfd9aa535462a003 (diff) | |
Merge branch 'main' into nat/releaseos following Maint X promotion
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 87b5b8b9af..8a6cb683d2 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -1133,8 +1133,7 @@ BOOL LLToolBarButton::handleHover(S32 x, S32 y, MASK mask) BOOL handled = FALSE; S32 mouse_distance_squared = (x - mMouseDownX) * (x - mMouseDownX) + (y - mMouseDownY) * (y - mMouseDownY); - static LLCachedControl<S32> drag_threshold(*LLUI::getInstance()->mSettingGroups["config"], "DragAndDropDistanceThreshold", 3); - if (mouse_distance_squared > drag_threshold * drag_threshold + if (mouse_distance_squared > DRAG_N_DROP_DISTANCE_THRESHOLD * DRAG_N_DROP_DISTANCE_THRESHOLD && hasMouseCapture() && mStartDragItemCallback && mHandleDragItemCallback) { |