diff options
author | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
commit | 53ce47fc1c2a713c6d7dd7fd9f98e50de727b974 (patch) | |
tree | fcc220f37f0de56d63c5f501e7c577463106eb69 /indra/llui/lltooltip.cpp | |
parent | f36cf6f1bad7e239011ab3ad40dca8002f42083c (diff) | |
parent | 395a29717026221255d8bed57098afa52c49bff9 (diff) |
merge changes for STORM-1654
Diffstat (limited to 'indra/llui/lltooltip.cpp')
-rw-r--r-- | indra/llui/lltooltip.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index bc6461a0c2..23cdd9ad9a 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -200,7 +200,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p) icon_params.image_selected(imagep); icon_params.scale_image(true); - icon_params.flash_color(icon_params.highlight_color()); + icon_params.flash_color.control = "ButtonUnselectedFgColor"; mInfoButton = LLUICtrlFactory::create<LLButton>(icon_params); if (p.click_callback.isProvided()) { |