summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-07-08 14:51:27 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-07-08 14:51:27 -0700
commit58ab4dfd885336d84caa2853f4c4e5da1d685a07 (patch)
tree86463d7560ba00dce7b7ebdaa7f1ab1dfae9e93f /indra/newview/llvoavatar.cpp
parentc80da2248d17bf9355fccd203b51548f983bd8ab (diff)
EXT-8140 Changing items in "add more" view, or editing the items, causes avatar to bounce up and down
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r--indra/newview/llvoavatar.cpp4
1 files changed, 3 insertions, 1 deletions
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();
}
}