diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-01 16:43:46 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-01 16:43:46 +0000 |
| commit | 45e291bfdf3fac219dd371b593e7a666b500b69f (patch) | |
| tree | e16cd49d770e12540ac03d1b7c48b197987d9204 | |
| parent | fcf25b690f94aff846a846fd52eeb778e8507f25 (diff) | |
| parent | b7a1b499fd03bd6bfaef37dbdaa9db734dc293b5 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #254)
SL-1531 Hover highlight should be consistent with mouse selection
| -rw-r--r-- | indra/llui/llmultislider.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp index b8f0a01b86..fbe0d3f065 100644 --- a/indra/llui/llmultislider.cpp +++ b/indra/llui/llmultislider.cpp @@ -507,17 +507,14 @@ BOOL LLMultiSlider::handleHover(S32 x, S32 y, MASK mask) { if (getEnabled()) { - if (mHoverSlider.empty() || !getSliderThumbRect(mHoverSlider).pointInRect(x, y)) + mHoverSlider.clear(); + std::map<std::string, LLRect>::iterator mIt = mThumbRects.begin(); + for (; mIt != mThumbRects.end(); mIt++) { - mHoverSlider.clear(); - std::map<std::string, LLRect>::iterator mIt = mThumbRects.begin(); - for (; mIt != mThumbRects.end(); mIt++) + if (mIt->second.pointInRect(x, y)) { - if (mIt->second.pointInRect(x, y)) - { - mHoverSlider = mIt->first; - break; - } + mHoverSlider = mIt->first; + break; } } } |