diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
| commit | d8f795aa9ceaae73ad8890a1110fa6b4045843c7 (patch) | |
| tree | 96bd0bbc9d7bbe2a6a8d9a543fc581d82fdc1965 /indra/newview/llvoavatar.cpp | |
| parent | 9ae6672a15ae64dba1d2af774dcde26700fb6126 (diff) | |
| parent | 467a8b0441e139773775ecf306f430f44814bff5 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 844ad6ca2d..47e35ca0c4 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2095,8 +2095,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(); } } |