livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-4048 SH-4171 SH-4046 FIX avatar sinks into ground, updates sent to observers 

Avatar preview code was triggering avatar size updates, which were causing the
avatar's height above the ground to change when the previews were rendered.

Also added code to suppress appearance updates being sent out while in
appearance editing mode.
master
Nyx Linden 2013-05-08 16:34:12 -04:00
parent e6bc0c5d69
commit 23c6016481
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llagent.cpp
View File

@ -4296,7 +4296,7 @@ void LLAgent::sendAgentSetAppearance()
return;
}
if (!isAgentAvatarValid() || (getRegion() && getRegion()->getCentralBakeVersion())) return;
if (!isAgentAvatarValid() || gAgentAvatarp->isEditingAppearance() || (getRegion() && getRegion()->getCentralBakeVersion())) return;
// At this point we have a complete appearance to send and are in a non-baking region.
// DRANO FIXME

4
indra/newview/lltoolmorph.cpp
View File

@ -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();