diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-06-27 05:57:21 +0530 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-06-27 05:57:21 +0530 |
| commit | a0beacf007b9e99b7d92647ebb31307d77eec51f (patch) | |
| tree | aaa117079939b55627afe28391b9dd167929e694 | |
| parent | ace5cb7d905000335a5ff3e8b74281b77d622a75 (diff) | |
[MAINT-8513] - use IMG_DEFAULT in case of no server bakes
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 20 |
2 files changed, 4 insertions, 18 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 5a502b61ab..5b4cc0980e 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -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 { diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 81d114d7ba..cba1fae758 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -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(); } |