From 58ab4dfd885336d84caa2853f4c4e5da1d685a07 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 8 Jul 2010 14:51:27 -0700 Subject: EXT-8140 Changing items in "add more" view, or editing the items, causes avatar to bounce up and down --- indra/newview/llappearancemgr.h | 2 ++ indra/newview/llvoavatar.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 8834f8c395..92e9b5157b 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -175,6 +175,8 @@ public: bool isOutfitLocked() { return mOutfitLocked; } + bool isInUpdateAppearanceFromCOF() { return mIsInUpdateAppearanceFromCOF; } + protected: LLAppearanceMgr(); ~LLAppearanceMgr(); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 1954a573d4..89c3839c3d 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(); } } -- cgit v1.2.3