diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-02-08 19:06:20 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-02-08 19:06:20 +0200 |
| commit | c8d8414b3b2e83fbaffd6e48f55ca14a3cb27ca4 (patch) | |
| tree | df7462dc694598ea85223288a64997b88ad1913a /indra/llui/llfolderviewitem.cpp | |
| parent | 43327798dec61590dc256697771e0423eb1ece9c (diff) | |
SL-10509 EEP Settings Picker gets closed by drag&drop
Diffstat (limited to 'indra/llui/llfolderviewitem.cpp')
| -rw-r--r-- | indra/llui/llfolderviewitem.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 0510e472c5..341399e980 100644 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -557,6 +557,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask ) LLFolderView* root = getRoot(); if( (x - mDragStartX) * (x - mDragStartX) + (y - mDragStartY) * (y - mDragStartY) > drag_and_drop_threshold() * drag_and_drop_threshold() + && root->getAllowDrag() && root->getCurSelectedItem() && root->startDrag()) { |