diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-10 10:22:25 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-10 10:22:25 +0100 |
| commit | 8a21f5e24145835db65e486bdca5692d2b4d8979 (patch) | |
| tree | eff902c19f0892dff1f2f21783a109bc5382155d /indra/newview/lldynamictexture.cpp | |
| parent | 3296f3b86452fddc840a3cb140d600fe0d5351dd (diff) | |
| parent | 820cffd56df5204e2aa0ceb6ce556a318dfaad7b (diff) | |
merge the latest ECC/Shining sprint work. http://bitbucket.org/seraph/viewer-development-shining
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index ed35546ca3..a3d2941114 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -54,6 +54,13 @@ LLViewerDynamicTexture::LLViewerDynamicTexture(S32 width, S32 height, S32 compon { llassert((1 <= components) && (components <= 4)); + if(gGLManager.mDebugGPU) + { + if(components == 3) + { + mComponents = 4 ; //convert to 32bits. + } + } generateGLTexture(); llassert( 0 <= order && order < ORDER_COUNT ); |