diff options
| author | daianakproductengine <daianakproductengine@lindenlab.com> | 2017-05-31 19:55:38 +0300 |
|---|---|---|
| committer | daianakproductengine <daianakproductengine@lindenlab.com> | 2017-05-31 19:55:38 +0300 |
| commit | 8c393b49930d695529ffee48864bb5aae5e71693 (patch) | |
| tree | deaf29540c93b6cec64871e49876b0628eacc383 /indra | |
| parent | 54d3e2634d66f3d32eef91ee81688276aeebd8ad (diff) | |
MAINT-321 If Spin option is turned on, user cannot lift an object using Ctrl button + Mouse
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index b14b9b7578..5b7cfb242e 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -638,20 +638,22 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask) // HACK - highlight buttons for next click mRadioGroupMove->setVisible(move_visible); - if (!gGrabBtnSpin && - !gGrabBtnVertical && - !(mask == MASK_VERTICAL) && - !(mask == MASK_SPIN) ) + if (!(gGrabBtnSpin || + gGrabBtnVertical || + (mask == MASK_VERTICAL) || + (mask == MASK_SPIN))) { mRadioGroupMove->setValue("radio move"); } - else if (gGrabBtnVertical || - (mask == MASK_VERTICAL) ) + else if ((mask == MASK_VERTICAL) || + gGrabBtnVertical && + (mask != MASK_SPIN)) { mRadioGroupMove->setValue("radio lift"); } - else if (gGrabBtnSpin || - (mask == MASK_SPIN) ) + else if ((mask == MASK_SPIN) || + gGrabBtnSpin && + (mask != MASK_VERTICAL)) { mRadioGroupMove->setValue("radio spin"); } |