diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-09 09:18:03 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-09 09:18:03 -0700 |
| commit | c371f359dc211f551c9ee3a999a77cee8027c6fa (patch) | |
| tree | e41e9b7d9c8ad21743387cdad10178c6d0b3d96b /indra/newview/llvoavatar.cpp | |
| parent | 0a2fc3e4b93c13854a1776456ebed7f53ceb67e8 (diff) | |
| parent | d8f795aa9ceaae73ad8890a1110fa6b4045843c7 (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 82823f3de2..ab5a75e307 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2097,8 +2097,10 @@ void LLVOAvatar::computeBodySize() if (new_body_size != mBodySize) { mBodySize = new_body_size; - if (isSelf()) + + if (isSelf() && !LLAppearanceMgr::instance().isInUpdateAppearanceFromCOF()) { // notify simulator of change in size + // but not if we are in the middle of updating appearance gAgent.sendAgentSetAppearance(); } } @@ -5566,6 +5568,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; |