diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 10:12:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 10:12:53 +0200 |
| commit | 16e638db975278f6018fe1e21ba1954b7f159149 (patch) | |
| tree | 876030bddc3b9e6cd885f829fb4a071aea309508 /indra/llimage | |
| parent | f815b015cecda18098dd2d16f65682a37e1bff7c (diff) | |
| parent | 990c8b81dad8bd0580c2c48f77e99b3ac53e581e (diff) | |
Merge pull request #1062 from secondlife/marchcat/yz-merge
Merge main into maint YZ
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimagebmp.cpp | 1 | ||||
| -rw-r--r-- | indra/llimage/llimagedxt.cpp | 1 | ||||
| -rw-r--r-- | indra/llimage/llimagetga.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/indra/llimage/llimagebmp.cpp b/indra/llimage/llimagebmp.cpp index 90b7272efa..cdea0da68d 100644 --- a/indra/llimage/llimagebmp.cpp +++ b/indra/llimage/llimagebmp.cpp @@ -321,6 +321,7 @@ bool LLImageBMP::updateData() mColorPalette = new(std::nothrow) U8[color_palette_size]; if (!mColorPalette) { + LLError::LLUserWarningMsg::showOutOfMemory(); LL_ERRS() << "Out of memory in LLImageBMP::updateData()" << LL_ENDL; return false; } 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; } diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp index 88bdae9b80..152a7f309c 100644 --- a/indra/llimage/llimagetga.cpp +++ b/indra/llimage/llimagetga.cpp @@ -266,6 +266,7 @@ bool LLImageTGA::updateData() mColorMap = new(std::nothrow) U8[ color_map_bytes ]; if (!mColorMap) { + LLError::LLUserWarningMsg::showOutOfMemory(); LL_ERRS() << "Out of Memory in bool LLImageTGA::updateData()" << LL_ENDL; return false; } |