From 8c393b49930d695529ffee48864bb5aae5e71693 Mon Sep 17 00:00:00 2001 From: daianakproductengine Date: Wed, 31 May 2017 19:55:38 +0300 Subject: MAINT-321 If Spin option is turned on, user cannot lift an object using Ctrl button + Mouse --- indra/newview/llfloatertools.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'indra/newview/llfloatertools.cpp') 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"); } -- cgit v1.2.3 From 13cddfdfdd8c42367af8a197e1f2deefc986495b Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 1 Jun 2017 15:30:49 +0300 Subject: Mac buildfix --- indra/newview/llfloatertools.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloatertools.cpp') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 5b7cfb242e..2869256d09 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -646,14 +646,12 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask) mRadioGroupMove->setValue("radio move"); } else if ((mask == MASK_VERTICAL) || - gGrabBtnVertical && - (mask != MASK_SPIN)) + (gGrabBtnVertical && (mask != MASK_SPIN))) { mRadioGroupMove->setValue("radio lift"); } else if ((mask == MASK_SPIN) || - gGrabBtnSpin && - (mask != MASK_VERTICAL)) + (gGrabBtnSpin && (mask != MASK_VERTICAL))) { mRadioGroupMove->setValue("radio spin"); } -- cgit v1.2.3