diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-26 15:15:09 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-26 15:15:09 +0300 |
| commit | 27e17344842bc3986fde39473effd39999b02a2c (patch) | |
| tree | e5feb4bad38f49a84833e75c0e3947c97fa76701 /indra/newview/lltexlayerparams.cpp | |
| parent | 002bbd885b1e22db12229c3a8ffb6c4fdbfdfc5c (diff) | |
| parent | 6ad892aa95b50a4bbcd369657d47d428ee248f96 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexlayerparams.cpp')
| -rw-r--r-- | indra/newview/lltexlayerparams.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexlayerparams.cpp b/indra/newview/lltexlayerparams.cpp index f2d1b5d032..dc97c4b673 100644 --- a/indra/newview/lltexlayerparams.cpp +++ b/indra/newview/lltexlayerparams.cpp @@ -180,7 +180,7 @@ void LLTexLayerParamAlpha::setWeight(F32 weight, BOOL upload_bake) if ((mAvatar->getSex() & getSex()) && (mAvatar->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param. { - if (gAgentCamera.cameraCustomizeAvatar()) + if (isAgentAvatarValid() && !gAgentAvatarp->isUsingBakedTextures()) { upload_bake = FALSE; } |