diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-30 12:42:30 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-30 12:42:30 -0500 |
| commit | 4ff4d99c4751b905c12ab56289b63e39ef6269de (patch) | |
| tree | 59888efb5f650b0a06ad70cfc296d93b90a1654b /indra/newview/lltextureview.cpp | |
| parent | f7ddde3807a3437cc036e687d216ef69feb6214b (diff) | |
| parent | 8c1f8c77469a3b1dbc66f56f8722c0c01fdddf8a (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 6547154bc4..6effa77ced 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 |