diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
| commit | df93749819c503a66bc0ad34aeb1c7bed3746df2 (patch) | |
| tree | 9bc6ae94c08fd881b8a73bfc0bc4ea79169ebf9e /indra/newview/lltextureatlas.cpp | |
| parent | 764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (diff) | |
| parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/lltextureatlas.cpp')
| -rw-r--r-- | indra/newview/lltextureatlas.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltextureatlas.cpp b/indra/newview/lltextureatlas.cpp index d2e4b01732..f8c1bca8ae 100644 --- a/indra/newview/lltextureatlas.cpp +++ b/indra/newview/lltextureatlas.cpp @@ -116,7 +116,6 @@ LLGLuint LLTextureAtlas::insertSubTexture(LLImageGL* source_gl_tex, S32 discard_ return 0 ; } - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, TRUE); glTexSubImage2D(GL_TEXTURE_2D, 0, xoffset, yoffset, w, h, mGLTexturep->getPrimaryFormat(), mGLTexturep->getFormatType(), raw_image->getData()); |