summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-05-09 16:19:50 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-05-09 16:19:50 -0400
commit85b42d94834d5b9b9993c058ca848d6148e1f49b (patch)
treec15717fa78981efde46bf86ae70a4fee35d2c01b /indra/newview/lltoolmorph.cpp
parent228178ac15f60f9b66b72a9d3f13e706d7d6de36 (diff)
parenta6ad1ba447781f255b5038ee545879dd571321ab (diff)
merge
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
-rw-r--r--indra/newview/lltoolmorph.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index f39b98dd31..fa94b52362 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -159,7 +159,9 @@ void LLVisualParamHint::preRender(BOOL clear_depth)
gAgentAvatarp->setVisualParamWeight("Blink_Left", 0.f);
gAgentAvatarp->setVisualParamWeight("Blink_Right", 0.f);
gAgentAvatarp->updateComposites();
- gAgentAvatarp->updateVisualParams();
+ // Calling LLCharacter version, as we don't want position/height changes to cause the avatar to jump
+ // up and down when we're doing preview renders. -Nyx
+ gAgentAvatarp->LLCharacter::updateVisualParams();
gAgentAvatarp->updateGeometry(gAgentAvatarp->mDrawable);
gAgentAvatarp->updateLOD();