diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-12 12:52:31 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-12 12:52:31 +0300 |
| commit | ea35754f08a9a76208d1edd80ed6bc55278eb575 (patch) | |
| tree | 1ceada3b919f4bf8dfa8e1dc048baadf87784795 /indra/newview/llvoavatar.cpp | |
| parent | d8e26b7b73b734e1745795788c844f6aab3360fe (diff) | |
| parent | ee50934d886b07c85e3be0515ff3e53625052faa (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 89c3839c3d..47e35ca0c4 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5725,6 +5725,7 @@ LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* vi if (!attachment) { llwarns << "Object attachment point invalid: " << attachmentID << llendl; + attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest) } return attachment; |