diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
| commit | c6d752b880cacca8fb8f10f28790a50161fcb9ab (patch) | |
| tree | 14910a69597962134f2e78e864a2f05962a16356 /indra/newview/llfetchedgltfmaterial.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 7d87e41bbd5d4761b1eb17e49b7a00b948d84213 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
Diffstat (limited to 'indra/newview/llfetchedgltfmaterial.cpp')
| -rw-r--r-- | indra/newview/llfetchedgltfmaterial.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfetchedgltfmaterial.cpp b/indra/newview/llfetchedgltfmaterial.cpp index 1dd1dbabbe..e58027e579 100644 --- a/indra/newview/llfetchedgltfmaterial.cpp +++ b/indra/newview/llfetchedgltfmaterial.cpp @@ -159,8 +159,8 @@ LLViewerFetchedTexture* fetch_texture(const LLUUID& id) LLViewerFetchedTexture* img = nullptr; if (id.notNull()) { - img = LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); - img->addTextureStats(64.f * 64.f, TRUE); + img = LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + img->addTextureStats(64.f * 64.f, true); } return img; }; @@ -263,3 +263,4 @@ void LLFetchedGLTFMaterial::materialComplete(bool success) materialCompleteCallbacks.clear(); materialCompleteCallbacks.shrink_to_fit(); } + |