diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
| commit | bd95e64d3da1b90b37e88e31979cc8f227d5cc58 (patch) | |
| tree | fff84f4075cb34a3fdd589bf399e47bebb8bc17d /indra/newview/llviewerobject.cpp | |
| parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
Set hotfix build params for Release.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b5642d07a5..6c8346df86 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4029,7 +4029,8 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const avatar_parent = (LLViewerObject*)root_edit->getParent(); } - if (avatar_parent && avatar_parent->isAvatar() && root_edit && root_edit->mDrawable.notNull()) + if (avatar_parent && avatar_parent->isAvatar() && + root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent()) { LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent(); position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition(); |