diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-02 17:08:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-02 17:08:46 -0400 |
| commit | 36634bf50f18038c2a343c786e8b22384a501eae (patch) | |
| tree | 2baa639b76f2b578bac1ac3cc3221ff9326bd04c /indra/llrender | |
| parent | 9c8fdf5a49145f4147f50c16c4e1775386976798 (diff) | |
| parent | 4f2c25979488733bcf92bc2f6ec357618c3e9632 (diff) | |
merge changes for latest integration changes
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llrendertarget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 6e22712b94..09ef780424 100755 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -572,8 +572,10 @@ void LLRenderTarget::copyContentsToFramebuffer(LLRenderTarget& source, S32 srcX0 { if (!source.mFBO) { - llerrs << "Cannot copy framebuffer contents for non FBO render targets." << llendl; + llwarns << "Cannot copy framebuffer contents for non FBO render targets." << llendl; + return; } + { GLboolean write_depth = mask & GL_DEPTH_BUFFER_BIT ? TRUE : FALSE; |