From ae3b5a4907b4611644d3b21c75ed420bc58593a2 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 17 Oct 2011 15:15:40 -0700
Subject: [PATCH] * Fixed icon opacity on selected and unselected buttons
---
indra/llui/llbutton.cpp | 2 +-
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 2d3007cd5fd..74b8885e1ff 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 8faa9b39884..629c7d9bc74 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;
--
GitLab