diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-09-19 17:52:58 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-09-19 17:52:58 -0400 |
| commit | 9a8afee83f40e7239d98e6cc8cf3297408f51920 (patch) | |
| tree | dcaeb915a508c376d5a957983cc6935ec45aeef9 /indra/newview/llvoavatarself.cpp | |
| parent | 48bc05e93ffbd29b3e49c288577bda1712a88392 (diff) | |
SH-3455 WIP - removing bake upload code
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 4cea3d3f58..17e6f4e53e 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1063,8 +1063,7 @@ void LLVOAvatarSelf::updateAttachmentVisibility(U32 camera_mode) // forces an update to any baked textures relevant to type. // will force an upload of the resulting bake if the second parameter is TRUE //----------------------------------------------------------------------------- -// SUNSHINE CLEANUP no upload_result -void LLVOAvatarSelf::wearableUpdated( LLWearableType::EType type, BOOL upload_result ) +void LLVOAvatarSelf::wearableUpdated(LLWearableType::EType type) { for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter = LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin(); baked_iter != LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end(); @@ -1577,18 +1576,6 @@ void LLVOAvatarSelf::invalidateComposite( LLTexLayerSet* layerset) layer_set->requestUpdate(); layer_set->invalidateMorphMasks(); - -#if 0 // SUNSHINE CLEANUP - if( upload_result && (getRegion() && !getRegion()->getCentralBakeVersion())) - { - llassert(isSelf()); - - ETextureIndex baked_te = getBakedTE( layer_set ); - setTEImage( baked_te, LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT_AVATAR) ); - layer_set->requestUpload(); - updateMeshTextures(); - } -#endif } void LLVOAvatarSelf::invalidateAll() |