summaryrefslogtreecommitdiff
path: root/indra/llappearance/lltexlayerparams.cpp
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-10-25 16:43:36 -0400
committerNyx Linden <nyx@lindenlab.com>2013-10-25 16:43:36 -0400
commitb1838f02bc6c4a052c68fc6bbf3106e3a796a1a2 (patch)
tree7848f11c33e3c91eb8e3d85f1d42bae902fb2811 /indra/llappearance/lltexlayerparams.cpp
parentdba221e0ac89b1505ddd3b896946286d5d1cf3d8 (diff)
SH-4572 FIX changing clothing parameters do not take effect in edit appearance
fix, new back-end utility and restoring the necessary functionality.
Diffstat (limited to 'indra/llappearance/lltexlayerparams.cpp')
-rwxr-xr-xindra/llappearance/lltexlayerparams.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 36147f01e0..9608e2d391 100755
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -178,6 +178,7 @@ void LLTexLayerParamAlpha::setWeight(F32 weight)
if ((mAvatarAppearance->getSex() & getSex()) &&
(mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param.
{
+ mAvatarAppearance->invalidateComposite(mTexLayer->getTexLayerSet());
mTexLayer->invalidateMorphMasks();
}
}
@@ -464,6 +465,24 @@ void LLTexLayerParamColor::setWeight(F32 weight)
if (cur_u8 != new_u8)
{
mCurWeight = new_weight;
+
+ const LLTexLayerParamColorInfo *info = (LLTexLayerParamColorInfo *)getInfo();
+
+ if (info->mNumColors <= 0)
+ {
+ // This will happen when we set the default weight the first time.
+ return;
+ }
+
+ if ((mAvatarAppearance->getSex() & getSex()) && (mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param.
+ {
+ onGlobalColorChanged();
+ if (mTexLayer)
+ {
+ mAvatarAppearance->invalidateComposite(mTexLayer->getTexLayerSet());
+ }
+ }
+
// llinfos << "param " << mName << " = " << new_weight << llendl;
}
}