diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-02 14:26:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-02 14:26:33 -0500 |
| commit | 5b2dbbadf70ee33bfd288b6384ae0d51715488b1 (patch) | |
| tree | 48d7678fbbca7359db17b472e3233c1d2874828b /indra/llrender/llrendertarget.cpp | |
| parent | 03290257345c22f909cf1cfac3981e7e07820d21 (diff) | |
| parent | 34408bed2644ff957502454f05c21c31fec90009 (diff) | |
merge changes for latest viewer-development
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; } |