aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llhudicon.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-01 17:39:58 -0600
committerJacek Antonelli2008-12-01 17:40:06 -0600
commit7abecb48babe6a6f09bf6692ba55076546cfced9 (patch)
tree8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/llhudicon.cpp
parentSecond Life viewer sources 1.21.6 (diff)
downloadmeta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/llhudicon.cpp')
-rw-r--r--linden/indra/newview/llhudicon.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llhudicon.cpp b/linden/indra/newview/llhudicon.cpp
index 85cc996..5d5c6a1 100644
--- a/linden/indra/newview/llhudicon.cpp
+++ b/linden/indra/newview/llhudicon.cpp
@@ -86,7 +86,7 @@ void LLHUDIcon::renderIcon(BOOL for_select)
86 LLGLDepthTest gls_depth(GL_TRUE); 86 LLGLDepthTest gls_depth(GL_TRUE);
87 if (for_select) 87 if (for_select)
88 { 88 {
89 LLViewerImage::unbindTexture(0); 89 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
90 } 90 }
91 91
92 if (mHidden) 92 if (mHidden)
@@ -163,10 +163,10 @@ void LLHUDIcon::renderIcon(BOOL for_select)
163 LLColor4 icon_color = LLColor4::white; 163 LLColor4 icon_color = LLColor4::white;
164 icon_color.mV[VALPHA] = alpha_factor; 164 icon_color.mV[VALPHA] = alpha_factor;
165 gGL.color4fv(icon_color.mV); 165 gGL.color4fv(icon_color.mV);
166 LLViewerImage::bindTexture(mImagep); 166 gGL.getTexUnit(0)->bind(mImagep.get());
167 } 167 }
168 168
169 gGL.begin(LLVertexBuffer::QUADS); 169 gGL.begin(LLRender::QUADS);
170 { 170 {
171 gGL.texCoord2f(0.f, 1.f); 171 gGL.texCoord2f(0.f, 1.f);
172 gGL.vertex3fv(upper_left.mV); 172 gGL.vertex3fv(upper_left.mV);