Skip to content
Snippets Groups Projects
Commit 9c977aaf authored by Nyx (Neal Orman)'s avatar Nyx (Neal Orman)
Browse files

Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/ 

--HG--
branch : avatar-pipeline
parents b88778ca afe1ad54
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
indra/newview/llscrollingpanelparam.cpp
+ 2
− 2
View file @ 9c977aaf
...@@ -73,9 +73,9 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLPanel::Params& panel_param ...@@ -73,9 +73,9 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLPanel::Params& panel_param
F32 min_weight = param->getMinWeight(); F32 min_weight = param->getMinWeight();
F32 max_weight = param->getMaxWeight(); F32 max_weight = param->getMaxWeight();
mHintMin = new LLVisualParamHint( pos_x, pos_y, PARAM_HINT_WIDTH, PARAM_HINT_HEIGHT, mesh, param, min_weight); mHintMin = new LLVisualParamHint( pos_x, pos_y, PARAM_HINT_WIDTH, PARAM_HINT_HEIGHT, mesh, (LLViewerVisualParam*) wearable->getVisualParam(param->getID()), min_weight);
pos_x += PARAM_HINT_WIDTH + 3 * BTN_BORDER; pos_x += PARAM_HINT_WIDTH + 3 * BTN_BORDER;
mHintMax = new LLVisualParamHint( pos_x, pos_y, PARAM_HINT_WIDTH, PARAM_HINT_HEIGHT, mesh, param, max_weight ); mHintMax = new LLVisualParamHint( pos_x, pos_y, PARAM_HINT_WIDTH, PARAM_HINT_HEIGHT, mesh, (LLViewerVisualParam*) wearable->getVisualParam(param->getID()), max_weight );
mHintMin->setAllowsUpdates( FALSE ); mHintMin->setAllowsUpdates( FALSE );
mHintMax->setAllowsUpdates( FALSE ); mHintMax->setAllowsUpdates( FALSE );
......
indra/newview/lltoolmorph.cpp
+ 5
− 3
View file @ 9c977aaf
...@@ -146,8 +146,9 @@ void LLVisualParamHint::preRender(BOOL clear_depth) ...@@ -146,8 +146,9 @@ void LLVisualParamHint::preRender(BOOL clear_depth)
{ {
LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); LLVOAvatarSelf* avatarp = gAgent.getAvatarObject();
mLastParamWeight = avatarp->getVisualParamWeight(mVisualParam); mLastParamWeight = mVisualParam->getWeight();
avatarp->setVisualParamWeight(mVisualParam, mVisualParamWeight); mVisualParam->setWeight(mVisualParamWeight, FALSE);
avatarp->setVisualParamWeight(mVisualParam->getID(), mVisualParamWeight, FALSE);
avatarp->setVisualParamWeight("Blink_Left", 0.f); avatarp->setVisualParamWeight("Blink_Left", 0.f);
avatarp->setVisualParamWeight("Blink_Right", 0.f); avatarp->setVisualParamWeight("Blink_Right", 0.f);
avatarp->updateComposites(); avatarp->updateComposites();
...@@ -242,7 +243,8 @@ BOOL LLVisualParamHint::render() ...@@ -242,7 +243,8 @@ BOOL LLVisualParamHint::render()
gGL.setSceneBlendType(LLRender::BT_ALPHA); gGL.setSceneBlendType(LLRender::BT_ALPHA);
gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
} }
avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight); avatarp->setVisualParamWeight(mVisualParam->getID(), mLastParamWeight);
mVisualParam->setWeight(mLastParamWeight, FALSE);
gGL.color4f(1,1,1,1); gGL.color4f(1,1,1,1);
mGLTexturep->setGLTextureCreated(true); mGLTexturep->setGLTextureCreated(true);
return TRUE; return TRUE;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment