diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-03-11 12:41:06 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-03-11 12:41:06 -0700 |
| commit | 1051220d4b3b09c6cb91d25f9ddfa9eed2ccfd45 (patch) | |
| tree | d6c84dd0fe6590eb3b604adf2a8b7cfa56a7be11 /indra/newview/pipeline.cpp | |
| parent | f061b2b90e34d74b9c6db3606babb0402473a24d (diff) | |
| parent | 4658280ddf979b877e5cf64f091156f89b89f9f7 (diff) | |
Merged vwr-cat..#$%$% whitespace diffs
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
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()); + } } } |