summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-07 15:15:59 -0500
committerOz Linden <oz@lindenlab.com>2014-01-07 15:15:59 -0500
commitfcac9fdaddaea6ec94d1c3726c8f19809d696169 (patch)
tree1b7c9c8412323110664154e1189b7fa854b524ba /indra/llui/llbutton.cpp
parentad40f7534fdae6ec85597bbfce32e72248cd61fa (diff)
parenta25bcb8523db08877c47fdbd834589ebbe45ff82 (diff)
merge changes for Snowstorm fall contributions
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;