diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-07 13:11:39 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-07 13:11:39 -0500 |
commit | 3bcd4f4608a7ce33b61c6978544096436dea4e53 (patch) | |
tree | 6ef7168a6ec646c023d2f4badc9a0960d20eea3e /indra/llrender/llrendertarget.cpp | |
parent | 33a42b32ca72031a79edca821966f6ebbdcddc93 (diff) | |
parent | 5e367f0d9de593c45683f7c640024a378bb03919 (diff) |
Merge daggy fix at r32811ea374ab to tip
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; } |