summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-11-16 17:24:05 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-11-16 17:24:05 -0500
commit6098706ae532131a4df890988dc209961ff52a33 (patch)
treec3956ac43cc7c8606c95331f37274fad9417e3ec /indra/newview/lltoolmorph.cpp
parent6f52f1e502cf030ceb4e14963fdda1021ea33023 (diff)
EXT-2445 appearance editor doesn't show correct previews
This system is in dire need of a rewrite, but the bug reported is fairly simple. The visual params in the avatar are no longer authoritative, the real values are stored in the wearable itself. The appearance editor was manipulating the values in the avatar object, resulting in no change. Updated the preview windows to use the parameter objects stored in the wearable. Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
-rw-r--r--indra/newview/lltoolmorph.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index d7d7b5f44b..14524580bf 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -146,8 +146,8 @@ void LLVisualParamHint::preRender(BOOL clear_depth)
{
LLVOAvatarSelf* avatarp = gAgent.getAvatarObject();
- mLastParamWeight = avatarp->getVisualParamWeight(mVisualParam);
- avatarp->setVisualParamWeight(mVisualParam, mVisualParamWeight);
+ mLastParamWeight = mVisualParam->getWeight();
+ mVisualParam->setWeight(mVisualParamWeight, FALSE);
avatarp->setVisualParamWeight("Blink_Left", 0.f);
avatarp->setVisualParamWeight("Blink_Right", 0.f);
avatarp->updateComposites();
@@ -242,7 +242,7 @@ BOOL LLVisualParamHint::render()
gGL.setSceneBlendType(LLRender::BT_ALPHA);
gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
}
- avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
+ mVisualParam->setWeight(mLastParamWeight, FALSE);
gGL.color4f(1,1,1,1);
mGLTexturep->setGLTextureCreated(true);
return TRUE;