summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-11 16:26:57 -0500
committerDave Parks <davep@lindenlab.com>2013-06-11 16:26:57 -0500
commit471182e9131b6ea563600900ba7dac03753aed1a (patch)
treed15256fcccd355af4ba0b6bcc4e97b07b717b138 /indra/newview
parent840c2f9237c9b5b7f5febc663a102c02aeb47b6f (diff)
NORSPEC-259 Fix for crash in LLRenderTarget::copyContentsToFramebuffer
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/pipeline.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index c144a07512..b5fbf08786 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1058,6 +1058,12 @@ void LLPipeline::updateRenderDeferred()
{ //must render glow when rendering deferred since post effect pass is needed to present any lighting at all
sRenderGlow = TRUE;
}
+
+ if (LLRenderTarget::sUseFBO && !sRenderDeferred)
+ { //this case should never happen, but some odd startup state can cause it to
+ LLRenderTarget::sUseFBO = FALSE;
+ }
+
}
//static