summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-15 12:24:47 -0600
committerDave Parks <davep@lindenlab.com>2011-11-15 12:24:47 -0600
commitab7a85602fdf9904411f1c8f143e8bf5470b28d9 (patch)
tree393664bdb2a6d70b2c2eb3713e06dcd510ddc3db /indra/llui
parent73d70b5d4562cf00f810446479918e64cbcb6008 (diff)
parent961ce1c4e785103b696a8ec76674aee4c91fe011 (diff)
merge
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llui.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index c6f7e28027..33bc247987 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -955,10 +955,12 @@ void gl_ring( F32 radius, F32 width, const LLColor4& center_color, const LLColor
if( render_center )
{
gGL.color4fv(center_color.mV);
+ gGL.diffuseColor4fv(center_color.mV);
gl_deep_circle( radius, width, steps );
}
else
{
+ gGL.diffuseColor4fv(side_color.mV);
gl_washer_2d(radius, radius - width, steps, side_color, side_color);
gGL.translateUI(0.f, 0.f, width);
gl_washer_2d(radius - width, radius, steps, side_color, side_color);