summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-02-11 13:41:31 -0500
committerMonty Brandenberg <monty@lindenlab.com>2014-02-11 13:41:31 -0500
commit744381956022c74b8617098ab28b52230dfbd0c2 (patch)
treeb53aafab1f3067c78bc0564bada8da9bff82a48f /indra/llui/llbutton.cpp
parent80ee8a8ca3725265636f8052a2442a74a742338f (diff)
parent413be91cf5044889ade97dcbec4b17fceff122e3 (diff)
Merge. Refresh from viewer-release after 3.7.0 release
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rwxr-xr-xindra/llui/llbutton.cpp2
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;