diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-13 16:11:22 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-13 16:11:22 -0500 |
| commit | c0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (patch) | |
| tree | 69bed5c3a72357e183384917b5495c2990e1ac13 /indra/newview/lltextureview.cpp | |
| parent | 19371a9abed3198f9f6083c3b2483e65778e944a (diff) | |
| parent | 38c19f4e55c0f6a104de87dfb57313a6c529b4d6 (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 |