diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-26 23:46:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-26 23:46:04 +0000 |
| commit | 71d48254e832e81ecb4c5e6a4750976cbb9afd0c (patch) | |
| tree | 98b34873d2a683f2bb74cc7426aed9ae74e65587 /indra | |
| parent | af98aad98d43ec8b128ecac3089426d6ae6edc3f (diff) | |
EXT-730 - Crash in LLHUDEffectLookAt::calcTargetPosition
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llhudeffectlookat.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp index 3a5bec2be0..e366340a10 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 59be38a1b0..4dc70511ce 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -192,6 +192,8 @@ public: 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 |