diff options
author | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
commit | 37593f276cacb9db7f1f8ed8ff6c1fe1b56ff883 (patch) | |
tree | 2ec32a4cf984cde8a003f45b324de328f318c675 /indra/llrender/llrendertarget.cpp | |
parent | 944814941d16e7853ff365acc17a16b3a20ac9cb (diff) | |
parent | facb0fa42cf7dbc4deb3a4026cc216aa0099111e (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
-rw-r--r-- | indra/llrender/llrendertarget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 1aa12614ea..ef2a7395da 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -457,7 +457,8 @@ void LLRenderTarget::copyContents(LLRenderTarget& source, S32 srcX0, S32 srcY0, gGL.flush(); if (!source.mFBO || !mFBO) { - llerrs << "Cannot copy framebuffer contents for non FBO render targets." << llendl; + llwarns << "Cannot copy framebuffer contents for non FBO render targets." << llendl; + return; } |