diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-27 22:01:40 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-27 22:01:40 +0000 |
| commit | 793dde16f371408948474d31f9275ea4031b65aa (patch) | |
| tree | 57d46ee9729c2b1888634ce080ce04d4cc2607f3 /indra/llappearance/lltexlayerparams.cpp | |
| parent | 4f93192e7d00f1f03e0e5241e9f1d2f31623729c (diff) | |
| parent | 352698140775e62498686f80b5aa21aee85524cf (diff) | |
Merge sunshine-internal -> sunshine-experimental
Diffstat (limited to 'indra/llappearance/lltexlayerparams.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llappearance/lltexlayerparams.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp index 82c92b5a5e..32bdba4e1c 100644..100755 --- a/indra/llappearance/lltexlayerparams.cpp +++ b/indra/llappearance/lltexlayerparams.cpp @@ -174,12 +174,9 @@ void LLTexLayerParamAlpha::setWeight(F32 weight, BOOL upload_bake) { mCurWeight = new_weight; - if ((mAvatarAppearance->getSex() & getSex()) && (mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param. + if ((mAvatarAppearance->getSex() & getSex()) && + (mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param. { - if (!mAvatarAppearance->isUsingBakedTextures()) - { - upload_bake = FALSE; - } mAvatarAppearance->invalidateComposite(mTexLayer->getTexLayerSet(), upload_bake); mTexLayer->invalidateMorphMasks(); } |