diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-12 14:38:45 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-12 14:38:45 +0300 |
| commit | 36d5c91f7c19d85ca07d9e96357406e74c812687 (patch) | |
| tree | a27fdfb4da0b08762b010aa4e626b9b8b9125e23 /indra/newview/llvoavatar.cpp | |
| parent | a40be985cc099dfe607c6f367c3dd690f21660fe (diff) | |
| parent | 809a7a3b78f5f14ef22d3a8725e958b1705bd102 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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; |