diff options
author | Oz Linden <oz@lindenlab.com> | 2012-01-13 09:58:47 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-01-13 09:58:47 -0500 |
commit | f6b8bfd3da163d275400035b24a969e5147c6352 (patch) | |
tree | 449fda9ad8f4628e0b1dfac31068a9a5d943a7af /indra/llrender/llrendertarget.cpp | |
parent | 6aa48f31c9af1f46335aa64648cda77912aa391d (diff) | |
parent | 4405910caa34446a19f66cfc35a9270a0e14292f (diff) |
merge changes for vmrg-215
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; } |