diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-08-31 19:52:36 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-08-31 19:52:36 -0400 |
commit | 85d659f44d2badfd42ee9b1ae7cd0971806672d4 (patch) | |
tree | ddcd10eff994df391dd4384d07fc6e5adfee5058 /indra/newview | |
parent | 88831427bf16a849c03032fbb66cc2effb1453e3 (diff) | |
parent | 2969599880f898219700aa0e314a870e6e480178 (diff) |
automated merge
Diffstat (limited to 'indra/newview')
-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 ); |