diff options
author | dolphin <dolphin@lindenlab.com> | 2014-02-12 14:31:37 -0800 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-02-12 14:31:37 -0800 |
commit | 7c3e51b05cfe8757bc72a8b5c19eff307b1e501f (patch) | |
tree | 8c3b36a820d7ea3eae7d0bb7bc544f8548986f02 /indra/llui/llbutton.cpp | |
parent | 8b690a3fdfb24aea23150031768e0734043195aa (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Merge with 3.7.0
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rwxr-xr-x | indra/llui/llbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 50ac511d18..3cfe5ac57f 100755 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -641,7 +641,7 @@ void LLButton::draw() bool use_glow_effect = FALSE; LLColor4 highlighting_color = LLColor4::white; - LLColor4 glow_color; + LLColor4 glow_color = LLColor4::white; LLRender::eBlendType glow_type = LLRender::BT_ADD_WITH_ALPHA; LLUIImage* imagep = NULL; |