diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-17 15:15:40 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-17 15:15:40 -0700 |
| commit | ae3b5a4907b4611644d3b21c75ed420bc58593a2 (patch) | |
| tree | f46a6cfc9ac72f353efe81c5009d0da622fe0d71 | |
| parent | 795695a2db6de25a85fb319e79c44f8a4e1903b2 (diff) | |
* Fixed icon opacity on selected and unselected buttons
| -rw-r--r-- | indra/llui/llbutton.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 2d3007cd5f..74b8885e1f 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -823,7 +823,7 @@ void LLButton::draw() { overlay_color = mImageOverlayDisabledColor.get(); } - else if (!getToggleState()) + else if (getToggleState()) { overlay_color = mImageOverlaySelectedColor.get(); } diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 8faa9b3988..629c7d9bc7 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -1014,9 +1014,8 @@ void LLToolBarButton::setEnabled(BOOL enabled) mUnselectedLabelColor = mOriginalLabelColor; mSelectedLabelColor = mOriginalLabelColorSelected; mImageOverlayColor = mOriginalImageOverlayColor; - mOriginalImageOverlaySelectedColor = mOriginalImageOverlaySelectedColor; + mImageOverlaySelectedColor = mOriginalImageOverlaySelectedColor; } - else { mImageSelected = mImageDisabledSelected; |