diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:13:59 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:13:59 +0000 |
| commit | 30f74e81dc9dc8660b8b5ceb41469373c5c92e64 (patch) | |
| tree | c8c00a42d491523dae3c187884e5cb65e01f9a4f /indra/newview/llvoavatarself.cpp | |
| parent | bc9122feb959f4a9e38681908a48b679260acb73 (diff) | |
| parent | 22dccc74a8fbcf3231d932db39781727833b9259 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 13e28b246a..00998b300a 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -932,6 +932,13 @@ void LLVOAvatarSelf::wearableUpdated( EWearableType type, BOOL upload_result ) { const LLVOAvatarDictionary::BakedEntry *baked_dict = baked_iter->second; const LLVOAvatarDefines::EBakedTextureIndex index = baked_iter->first; + + // if we're editing our appearance, ensure that we're not using baked textures + // The baked texture for alpha masks is set explicitly when you hit "save" + if (gAgent.cameraCustomizeAvatar()) + { + setNewBakedTexture(index,IMG_DEFAULT_AVATAR); + } if (baked_dict) { for (LLVOAvatarDefines::wearables_vec_t::const_iterator type_iter = baked_dict->mWearables.begin(); |