diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-01-11 16:23:45 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-01-11 16:23:45 -0800 |
| commit | 05cbb2b46b4afe24cd2c17967da2694ffa85fb69 (patch) | |
| tree | 8cc56d98385943187f4416e26b645626e79a3126 /indra/newview | |
| parent | 4b8d390669d140b1cef7fcd913d701ee6c328a0a (diff) | |
| parent | 2aa67af38ebc122dfc6757d9bc2b9e0eabc10323 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview')
| -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); } |