diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-12 12:53:44 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-12 12:53:44 +0200 |
| commit | 3c3271761b918a19f7a10d80da9dd23e5127de2c (patch) | |
| tree | d4205dd5827c215b2cb615bc364b01b1b7eada0d /indra/newview/lldrawpoolbump.cpp | |
| parent | 13148203a440cf1bb36c928a8677bfeb7c0e32d6 (diff) | |
| parent | 3b2697cb93e6b8a1f1281aeab0e960bc6704d8c4 (diff) | |
Merge with default branch, resolved conflict in llpanelavatar.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 5f845c3721..03a8b108e2 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1149,14 +1149,14 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI if (!LLPipeline::sRenderDeferred) { bump->setExplicitFormat(GL_ALPHA8, GL_ALPHA); - bump->createGLTexture(bump->getDiscardLevel(), dst_image); + bump->createGLTexture(0, dst_image); } else { LLPointer<LLImageRaw> nrm_image = new LLImageRaw(src->getWidth(), src->getHeight(), 4); generateNormalMapFromAlpha(src, nrm_image); bump->setExplicitFormat(GL_RGBA, GL_RGBA); - bump->createGLTexture(bump->getDiscardLevel(), nrm_image); + bump->createGLTexture(0, nrm_image); } |