diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
| commit | 01e0b78c595e346bef4e771f9580006dd895367c (patch) | |
| tree | 90160c9edb07baa4fcfd022082608f96b1bfdc06 /indra/newview/llfloatertools.cpp | |
| parent | 2368c44a8e2b031e5a8ac199923a016915cfe96a (diff) | |
| parent | cf865bb5962a85e2da3414468d6a99ecb5423f97 (diff) | |
merge changes for DRTVWR-439
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"); } |