diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
| commit | 915ade1029eb39fcd8f3b997b4b8cf2b394c1eb9 (patch) | |
| tree | 577c0d98b21d05f0b6f28241f2ab2b7ee31f8618 /indra/newview/llvoavatar.cpp | |
| parent | dd7b0f96157bdfbdd8892cc8aa209182ae777380 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
merge changes for 3.6.11-release
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index c1a582af61..1e7d1644b2 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5656,7 +5656,7 @@ LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* vi << " trying to use 1 (chest)" << llendl; - attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest) + attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest) if (attachment) { llwarns << "Object attachment point invalid: " << attachmentID |