diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-10-03 21:46:14 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-10-04 18:57:13 +0300 |
| commit | a54a96a1f4d4c06fb58dcd7be6d01a54d02bd86f (patch) | |
| tree | 297d5d1b2cdaa970265c50a1056ca755740cbda5 | |
| parent | f846861f04fe8a5c755a12da45ba6e12e38a9360 (diff) | |
#1759 Fix texture picker using IMG_WHITE for blank materials
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index c3a98b33ff..b2f2509e80 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1704,10 +1704,16 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p) mDefaultImageName(p.default_image_name), mFallbackImage(p.fallback_image) { - - // Default of defaults is white image for diff tex - // - setBlankImageAssetID(IMG_WHITE); + if (mInventoryPickType == PICK_MATERIAL) + { + setBlankImageAssetID(BLANK_MATERIAL_ASSET_ID); + } + else + { + // Default of defaults is white image for diff tex + // + setBlankImageAssetID(IMG_WHITE); + } setAllowNoTexture(p.allow_no_texture); setCanApplyImmediately(p.can_apply_immediately); |