diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-03-05 11:11:54 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-03-05 11:11:54 -0800 |
| commit | 89b48796271f48c8b89e7981095bed4acf825a0f (patch) | |
| tree | 480703ed1c3bace62699f33ccbdcba705124fc16 /indra/llimage/llimagedxt.cpp | |
| parent | 8164dce567d1bd59a1de3f488b01783a5ab69ed4 (diff) | |
| parent | dd74c2cbd542daa8d6cedba7ba7a68268f7b73d3 (diff) | |
Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette
Diffstat (limited to 'indra/llimage/llimagedxt.cpp')
| -rw-r--r-- | indra/llimage/llimagedxt.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp index 36317a5ba8..ae76c5243f 100644 --- a/indra/llimage/llimagedxt.cpp +++ b/indra/llimage/llimagedxt.cpp @@ -437,6 +437,7 @@ bool LLImageDXT::convertToDXR() U8* newdata = (U8*)ll_aligned_malloc_16(total_bytes); if (!newdata) { + LLError::LLUserWarningMsg::showOutOfMemory(); LL_ERRS() << "Out of memory in LLImageDXT::convertToDXR()" << LL_ENDL; return false; } |