diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-23 16:34:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-23 16:34:17 -0400 |
| commit | 0c5a5934d87cb7e64cb8db96551009b9b9ed8be9 (patch) | |
| tree | a8973a0ab6ec43469a71ea80e1d6328a9ad779de /indra/newview/lltexlayerparams.cpp | |
| parent | d9f01a7c5a70d184bb5fac1f620cfbe1ad4c957d (diff) | |
| parent | 056685d9d4ac82aad45e46ae5d5226690d416513 (diff) | |
merge
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; } |