From 6ee123abcd64d9db21a7670ea7696a48a2b47fea Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sat, 4 May 2013 18:21:46 +0200
Subject: [PATCH] Crashfix.

---
 indra/newview/pipeline.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 6a4ecf9254..b93c270a26 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7275,7 +7275,15 @@ 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());
+					
+					// <FS:ND> Guard against agent not having a valid region set.
+
+					// focus_point = LLVector3(gAgentCamera.getFocusGlobal()-gAgent.getRegion()->getOriginGlobal());
+
+					if( gAgent.getRegion() )
+						focus_point = LLVector3(gAgentCamera.getFocusGlobal()-gAgent.getRegion()->getOriginGlobal());
+
+					// </FS:ND>
 				}
 			}