diff options
| author | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
| commit | b5dbb9c52aa8f9379662f1ff1169adadcf8ac5f8 (patch) | |
| tree | 438d099240df63608825568d162874e186835994 /indra/newview/llfloatertools.cpp | |
| parent | 8e6751efced8d9f5ede5ec5d954ff809d56d1162 (diff) | |
| parent | 58176de9574164e31790a148d9b5489a129fc961 (diff) | |
Automated merge with head of ll/viewer64 after DRTVWR-439 merge
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index b14b9b7578..2869256d09 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -638,20 +638,20 @@ 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"); } |