diff options
author | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
commit | 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch) | |
tree | 95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llhudtext.cpp | |
parent | Second Life viewer sources 1.20.6 (diff) | |
download | meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2 meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz |
Second Life viewer sources 1.20.7
Diffstat (limited to 'linden/indra/newview/llhudtext.cpp')
-rw-r--r-- | linden/indra/newview/llhudtext.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp index f8eddc7..26df22a 100644 --- a/linden/indra/newview/llhudtext.cpp +++ b/linden/indra/newview/llhudtext.cpp | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #include "llhudtext.h" | 34 | #include "llhudtext.h" |
35 | 35 | ||
36 | #include "llglimmediate.h" | 36 | #include "llrender.h" |
37 | 37 | ||
38 | #include "llagent.h" | 38 | #include "llagent.h" |
39 | #include "llviewercontrol.h" | 39 | #include "llviewercontrol.h" |
@@ -308,7 +308,6 @@ void LLHUDText::renderText(BOOL for_select) | |||
308 | } | 308 | } |
309 | LLUI::popMatrix(); | 309 | LLUI::popMatrix(); |
310 | 310 | ||
311 | |||
312 | LLImageGL::unbindTexture(0); | 311 | LLImageGL::unbindTexture(0); |
313 | LLGLDepthTest gls_depth(mZCompare ? GL_TRUE : GL_FALSE, GL_FALSE); | 312 | LLGLDepthTest gls_depth(mZCompare ? GL_TRUE : GL_FALSE, GL_FALSE); |
314 | 313 | ||
@@ -375,7 +374,7 @@ void LLHUDText::renderText(BOOL for_select) | |||
375 | 374 | ||
376 | // Render label | 375 | // Render label |
377 | { | 376 | { |
378 | glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); | 377 | gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT); |
379 | 378 | ||
380 | for(std::vector<LLHUDTextSegment>::iterator segment_iter = mLabelSegments.begin(); | 379 | for(std::vector<LLHUDTextSegment>::iterator segment_iter = mLabelSegments.begin(); |
381 | segment_iter != mLabelSegments.end(); ++segment_iter ) | 380 | segment_iter != mLabelSegments.end(); ++segment_iter ) |