diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 10:19:19 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 10:19:19 -0500 |
| commit | 522c4b4f0925463d5f30a4a0f314999a11d5def3 (patch) | |
| tree | 9e6f25155182f643ace380179592516a08792646 /indra/llimage/llimagedxt.cpp | |
| parent | afc943acbc2bb79e2e1aa5d5eaf448e01b6c2b00 (diff) | |
| parent | 5fca8915d8f44cdb2a4f7bb4715d61ba47043e5d (diff) | |
Merge branch '965-eep-skies-too-bright-after-hdri-local-preview-merge' of https://github.com/secondlife/viewer into 965-eep-skies-too-bright-after-hdri-local-preview-merge
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; } |