summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-03-08 17:42:22 -0600
committerDave Parks <davep@lindenlab.com>2013-03-08 17:42:22 -0600
commitb628518fd7c2ee6432dd2f49ecf192bd26455dba (patch)
treec498cc6d05e961a707630f91f308e818d91fe913 /indra/newview
parentf8e059deee28500b88c8c172eaa8c4d7ca657748 (diff)
MAINT-2461 Potential fix for crash in LLPipeline::renderBloom
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/pipeline.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 54a62a858a..e9cd74406d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7261,7 +7261,11 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
else
{
//focus on alt-zoom target
- focus_point = LLVector3(gAgentCamera.getFocusGlobal()-gAgent.getRegion()->getOriginGlobal());
+ LLViewerRegion* region = gAgent.getRegion();
+ if (region)
+ {
+ focus_point = LLVector3(gAgentCamera.getFocusGlobal()-region->getOriginGlobal());
+ }
}
}