livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MAINT-8513] - use IMG_DEFAULT in case of no server bakes

meow-7.2.2
Anchor Linden 2018-06-27 05:57:21 +05:30
parent ace5cb7d90
commit a0beacf007
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewerobject.cpp
View File

@ -4380,7 +4380,7 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id)
LLViewerTexture* bakedTexture = avatar->getBakedTexture(texIndex);
if (bakedTexture == NULL || bakedTexture->isMissingAsset())
{
return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
return LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
}
else
{

20
indra/newview/llvoavatar.cpp
View File

@ -8375,27 +8375,12 @@ LLViewerTexture* LLVOAvatar::getBakedTexture(const U8 te)
}
BOOL is_layer_baked = isTextureDefined(mBakedTextureDatas[te].mTextureIndex);
BOOL use_lkg_baked_layer; // lkg = "last known good"
LLViewerTexLayerSet* layerset = NULL;
layerset = getTexLayerSet(te);
BOOL layerset_invalid = layerset && (!layerset->getViewerComposite()->isInitialized() || !layerset->isLocalTextureDataAvailable());
use_lkg_baked_layer = (!is_layer_baked && (mBakedTextureDatas[te].mLastTextureID != IMG_DEFAULT_AVATAR) && layerset_invalid);
if (use_lkg_baked_layer)
{
layerset->setUpdatesEnabled(TRUE);
}
else
{
use_lkg_baked_layer = (!is_layer_baked && mBakedTextureDatas[te].mLastTextureID != IMG_DEFAULT_AVATAR);
}
if (use_lkg_baked_layer && !isUsingLocalAppearance())
{
LLViewerFetchedTexture* baked_img = LLViewerTextureManager::getFetchedTexture(mBakedTextureDatas[te].mLastTextureID);
return baked_img;
}
else if (!isUsingLocalAppearance() && is_layer_baked)
if (!isUsingLocalAppearance() && is_layer_baked)
{
LLViewerFetchedTexture* baked_img = LLViewerTextureManager::staticCastToFetchedTexture(getImage(mBakedTextureDatas[te].mTextureIndex, 0), TRUE);
return baked_img;
@ -8646,6 +8631,7 @@ void LLVOAvatar::useBakedTexture( const LLUUID& id )
}
}
}
dirtyMesh();
}