From 71d48254e832e81ecb4c5e6a4750976cbb9afd0c Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 26 Aug 2009 23:46:04 +0000
Subject: [PATCH] EXT-730 - Crash in LLHUDEffectLookAt::calcTargetPosition
---
indra/newview/llhudeffectlookat.cpp | 4 +++-
indra/newview/llvoavatar.h | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index 3a5bec2be0c..e366340a10b 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 59be38a1b05..4dc70511cea 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
--
GitLab