From 0be38781829650a4baa2d22faa5feb88242fdfdc Mon Sep 17 00:00:00 2001
From: Palmer <palmer@lindenlab.com>
Date: Wed, 28 Oct 2009 15:53:29 -0700
Subject: EXT-1930 - Crash after failed region crossing then teleport.  Null
 pointer accessed.

Reviewed by Nyx
---
 indra/newview/llvoavatar.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/llvoavatar.cpp')

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index a402aff8ab..f9c95afc31 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6400,6 +6400,11 @@ LLBBox LLVOAvatar::getHUDBBox() const
 				 ++attachment_iter)
 			{
 				const LLViewerObject* attached_object = (*attachment_iter);
+				if (attached_object == NULL)
+				{
+					llwarns << "HUD attached object is NULL!" << llendl;
+					continue;
+				}
 				// initialize bounding box to contain identity orientation and center point for attached object
 				bbox.addPointLocal(attached_object->getPosition());
 				// add rotated bounding box for attached object
-- 
cgit v1.2.3