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/llface.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/llface.cpp')
-rw-r--r-- | linden/indra/newview/llface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp index 4a5e532..3e0c5b2 100644 --- a/linden/indra/newview/llface.cpp +++ b/linden/indra/newview/llface.cpp | |||
@@ -42,7 +42,7 @@ | |||
42 | 42 | ||
43 | #include "lldrawpoolbump.h" | 43 | #include "lldrawpoolbump.h" |
44 | #include "llgl.h" | 44 | #include "llgl.h" |
45 | #include "llglimmediate.h" | 45 | #include "llrender.h" |
46 | #include "lllightconstants.h" | 46 | #include "lllightconstants.h" |
47 | #include "llsky.h" | 47 | #include "llsky.h" |
48 | #include "llviewercamera.h" | 48 | #include "llviewercamera.h" |
@@ -468,6 +468,7 @@ void LLFace::renderSelectedUV(const S32 offset, const S32 count) | |||
468 | if (pass == 0) | 468 | if (pass == 0) |
469 | { | 469 | { |
470 | LLViewerImage::bindTexture(red_blue_imagep); | 470 | LLViewerImage::bindTexture(red_blue_imagep); |
471 | red_blue_imagep->setMipFilterNearest (TRUE, TRUE); | ||
471 | } | 472 | } |
472 | else // pass == 1 | 473 | else // pass == 1 |
473 | { | 474 | { |
@@ -476,9 +477,8 @@ void LLFace::renderSelectedUV(const S32 offset, const S32 count) | |||
476 | glMatrixMode(GL_TEXTURE); | 477 | glMatrixMode(GL_TEXTURE); |
477 | glPushMatrix(); | 478 | glPushMatrix(); |
478 | glScalef(256.f, 256.f, 1.f); | 479 | glScalef(256.f, 256.f, 1.f); |
480 | green_imagep->setMipFilterNearest (TRUE, TRUE); | ||
479 | } | 481 | } |
480 | glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); | ||
481 | glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); | ||
482 | 482 | ||
483 | 483 | ||
484 | if (!isState(GLOBAL)) | 484 | if (!isState(GLOBAL)) |