summaryrefslogtreecommitdiff
path: root/indra/llrender/llrendertarget.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-01-13 09:58:47 -0500
committerOz Linden <oz@lindenlab.com>2012-01-13 09:58:47 -0500
commitf6b8bfd3da163d275400035b24a969e5147c6352 (patch)
tree449fda9ad8f4628e0b1dfac31068a9a5d943a7af /indra/llrender/llrendertarget.cpp
parent6aa48f31c9af1f46335aa64648cda77912aa391d (diff)
parent4405910caa34446a19f66cfc35a9270a0e14292f (diff)
merge changes for vmrg-215
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;
}