diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 21:41:25 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 21:41:25 +0200 |
| commit | f57219efed141b5bc33dd9d08b03a48c6607fa33 (patch) | |
| tree | 5744641957fe7ea94298228e4044d8c552a7dacb /indra/llappearance/lltexlayer.cpp | |
| parent | b49400e0882a80dd2972a31cde2152ba979b2ce4 (diff) | |
| parent | 6b866bc6432ef88a79a826c09b17107392bde15f (diff) | |
Merge branch 'release/2026.01' into marchcat/devlinux-2601
# Conflicts:
# indra/llcommon/llprocessor.cpp
# indra/llcorehttp/_refcounted.h
# indra/llcorehttp/_thread.h
# indra/newview/llfeaturemanager.cpp
# indra/newview/llviewershadermgr.cpp
Diffstat (limited to 'indra/llappearance/lltexlayer.cpp')
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index 389efe47a9..1bdaa814b7 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -1915,7 +1915,10 @@ LLGLTexture* LLTexLayerStaticImageList::getTexture(const std::string& file_name, image_raw->copyUnscaledAlphaMask(alpha_image_raw, LLColor4U::black); } - tex->createGLTexture(0, image_raw, 0, true, LLGLTexture::LOCAL); + if (!tex->createGLTexture(0, image_raw, 0, true, LLGLTexture::LOCAL)) + { + LL_WARNS() << "Failed to create GL texture for image: " << file_name << LL_ENDL; + } gGL.getTexUnit(0)->bind(tex); tex->setAddressMode(LLTexUnit::TAM_CLAMP); |