diff options
author | simon <none@none> | 2013-11-22 10:39:03 -0800 |
---|---|---|
committer | simon <none@none> | 2013-11-22 10:39:03 -0800 |
commit | f1be57cd30489902e44d7843703a39987f379c69 (patch) | |
tree | 0a4fa748cac9d415fab6095194b6031383d38a85 /indra/newview/llvoavatar.cpp | |
parent | a7381f6e40388900dd956a54167a33266e82238c (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
Merge server-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 f5918a0a5f..c3c1edb0a3 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5566,7 +5566,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 |