From 41916181cc2056dd8c7b4a23f8dcab637aa1fb8b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 26 Apr 2011 22:24:51 -0700
Subject: Backported crash fix in llhudeffectlookat from gpl'd viewer 2

---
 linden/indra/newview/llhudeffectlookat.cpp | 5 +++++
 linden/indra/newview/llvoavatar.h          | 1 +
 2 files changed, 6 insertions(+)

diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index ccd723f..333bd13 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -702,6 +702,11 @@ bool LLHUDEffectLookAt::calcTargetPosition()
 
 	LLVOAvatar* source_avatar = (LLVOAvatar*)(LLViewerObject*)mSourceObject;
 
+	if (!source_avatar->isBuilt())
+	{
+		return false;
+	}
+
 	if (target_obj && target_obj->mDrawable.notNull())
 	{
 		LLQuaternion target_rot;
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 4d08bf0..b9e4d17 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -231,6 +231,7 @@ public:
 
 	BOOL			isVisible();
 	BOOL			isSelf() const { return mIsSelf; }
+	bool			isBuilt() const { return mIsBuilt; }
 	BOOL			isCulled() const { return mCulled; }
 
 public:
-- 
cgit v1.1