diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index 3a5bec2be0c634497aea267dbbdb50d14198c8c6..e366340a10b5a0d85f3eeb9666c0cc017a12b285 100644
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -610,7 +610,9 @@ 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/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 59be38a1b0555f7799fecab3b2de884e537f4481..4dc70511ceaec6af6b671371956242f52b7428d6 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -192,6 +192,8 @@ class LLVOAvatar :
 
 public:
 	virtual bool 	isSelf() const { return false; } // True if this avatar is for this viewer's agent
+	bool isBuilt() const { return mIsBuilt; }
+	
 private:
 	BOOL			mSupportsAlphaLayers; // For backwards compatibility, TRUE for 1.23+ clients