diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-01-30 15:49:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 15:49:35 -0600 |
| commit | 9c378ca1e74229b5b1bb25fd63be5f1cf8349184 (patch) | |
| tree | 8f0f4a865fb04ef1e6ca8550b5fcefded689c162 /indra/newview/lltexturectrl.cpp | |
| parent | c8547ad8a588fca0a22b2194ad1b18b66153f32d (diff) | |
| parent | a5a4fd0c1026a994dd81ea6b703bcabcd8ed9501 (diff) | |
Merge pull request #703 from secondlife/release/gltf-maint2
Release/gltf maint2
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index febda177e2..0439b0b115 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -83,9 +83,11 @@ //static bool get_is_predefined_texture(LLUUID asset_id) { - if (asset_id == LLUUID(gSavedSettings.getString("DefaultObjectTexture")) - || asset_id == LLUUID(gSavedSettings.getString("UIImgWhiteUUID")) - || asset_id == LLUUID(gSavedSettings.getString("UIImgInvisibleUUID")) + if (asset_id == DEFAULT_OBJECT_TEXTURE + || asset_id == DEFAULT_OBJECT_SPECULAR + || asset_id == DEFAULT_OBJECT_NORMAL + || asset_id == BLANK_OBJECT_NORMAL + || asset_id == IMG_WHITE || asset_id == LLUUID(SCULPT_DEFAULT_TEXTURE)) { return true; @@ -1663,8 +1665,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p) // Default of defaults is white image for diff tex // - LLUUID whiteImage( gSavedSettings.getString( "UIImgWhiteUUID" ) ); - setBlankImageAssetID( whiteImage ); + setBlankImageAssetID(IMG_WHITE); setAllowNoTexture(p.allow_no_texture); setCanApplyImmediately(p.can_apply_immediately); |