diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-25 13:59:23 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-25 13:59:23 -0500 |
commit | 43d52671c8c71af188456c200baba7c3bc8d4799 (patch) | |
tree | fc6907dd94b940ad707bb9c01b956e61bd210fce /indra/newview/llvoavatarself.cpp | |
parent | ccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (diff) |
EXT-2769 hair alpha not applied immediately
Apparently none of the texture pickers were invalidating the baked textures
causing selected textures to not appear on the avatar until you actually saved
the wearable. This patch forces the composites to update when you change any
texture or color (or invisibility flag).
Code reviewed by Seraph
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r-- | indra/newview/llvoavatarself.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index f3e787ae7e..7d6401acde 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -918,9 +918,9 @@ void LLVOAvatarSelf::updateAttachmentVisibility(U32 camera_mode) //----------------------------------------------------------------------------- // updatedWearable( EWearableType type ) // forces an update to any baked textures relevant to type. -// Should be called only on saving the wearable +// will force an upload of the resulting bake if the second parameter is TRUE //----------------------------------------------------------------------------- -void LLVOAvatarSelf::wearableUpdated( EWearableType type ) +void LLVOAvatarSelf::wearableUpdated( EWearableType type, BOOL upload_result ) { for (LLVOAvatarDictionary::BakedTextures::const_iterator baked_iter = LLVOAvatarDictionary::getInstance()->getBakedTextures().begin(); baked_iter != LLVOAvatarDictionary::getInstance()->getBakedTextures().end(); @@ -939,7 +939,7 @@ void LLVOAvatarSelf::wearableUpdated( EWearableType type ) { if (mBakedTextureDatas[index].mTexLayerSet) { - invalidateComposite(mBakedTextureDatas[index].mTexLayerSet, TRUE); + invalidateComposite(mBakedTextureDatas[index].mTexLayerSet, upload_result); } break; } |