diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:30:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:30:34 -0500 |
| commit | b9439ac006ac64179180ec2a47f6bd92468de455 (patch) | |
| tree | 0d3da395c91ddadda4ad23b4d331ec001b6a4f84 /indra/newview/lltextureview.cpp | |
| parent | 5e22062b68d2392d465503b3954cf06001eda608 (diff) | |
| parent | 14f6bbadef2c39e58a3b54c0c6212949acf50e45 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltextureview.cpp')
| -rw-r--r-- | indra/newview/lltextureview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 0115115a23..f4b01a6bab 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -571,7 +571,7 @@ void LLGLTexMemBar::draw() color = (total_mem < llfloor(max_total_mem * texmem_lower_bound_scale)) ? LLColor4::green : (total_mem < max_total_mem) ? LLColor4::yellow : LLColor4::red; color[VALPHA] = .75f; - glColor4fv(color.mV); + gGL.diffuseColor4fv(color.mV); gl_rect_2d(left, top, right, bottom); // red/yellow/green @@ -594,7 +594,7 @@ void LLGLTexMemBar::draw() color = (bound_mem < llfloor(max_bound_mem * texmem_lower_bound_scale)) ? LLColor4::green : (bound_mem < max_bound_mem) ? LLColor4::yellow : LLColor4::red; color[VALPHA] = .75f; - glColor4fv(color.mV); + gGL.diffuseColor4fv(color.mV); gl_rect_2d(left, top, right, bottom); #else |