diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-20 15:56:37 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-20 15:56:37 -0400 |
| commit | 2d5b917cea8e1ca7c06fcc47d82a4ea25d3c4494 (patch) | |
| tree | 5f846d137ed3c0f4386747de0d7762e85ebdd3ad /indra | |
| parent | 62040b686568410cdd87d12228b48f0b2ee12f1b (diff) | |
EXT-8119 tattoo texture remains grey until rebake
texture pipeline always returns a valid image, we needed to check the image id
against IMG_DEFAULT instead of NULL. This causes the image to be correctly set
to IMG_DEFAULT_AVATAR, which is never rendered during layer baking.
Code reviewed by Seraph
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index f7e8a7b1a7..ebe5bf8b06 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -896,7 +896,7 @@ void LLPanelEditWearable::onTexturePickerCommit(const LLUICtrl* ctrl) { // Set the new version LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(texture_ctrl->getImageAssetID()); - if( image->getID().isNull() ) + if( image->getID() == IMG_DEFAULT ) { image = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT_AVATAR); } |