summaryrefslogtreecommitdiff
path: root/indra/llrender/llrendertarget.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-01-23 19:43:14 +0100
committerKitty Barnett <develop@catznip.com>2012-01-23 19:43:14 +0100
commit7b3bc9b58702940c039db620642c005e054040ed (patch)
treef8be20d7d49f7538e3f4daf4564410768c7007b7 /indra/llrender/llrendertarget.cpp
parentb81bf4f6f182e6345889d70140b34b15cbfb8d27 (diff)
parent64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
-rw-r--r--indra/llrender/llrendertarget.cpp3
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;
}