diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-03-28 11:05:36 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-03-28 11:05:36 +0800 |
| commit | 1a4517e5af8f43433fc2547658615dce4073d9a3 (patch) | |
| tree | 7a2dd9d392e7651674f17e342b44461ab47e5327 /indra/llrender/llimagegl.cpp | |
| parent | 9f20741e02491e009090211ac29bd37c31369378 (diff) | |
| parent | c810a409e22b90ebacb9946f8a4084ef0ad78d64 (diff) | |
Merge tag '7.1.4-release'
source for viewer 7.1.4.8149792635
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index bd24200029..d1f2789b11 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1404,6 +1404,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt scratch = new(std::nothrow) U32[width * height]; if (!scratch) { + LLError::LLUserWarningMsg::showOutOfMemory(); LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32)) << " bytes for a manual image W" << width << " H" << height << LL_ENDL; } @@ -1429,6 +1430,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt scratch = new(std::nothrow) U32[width * height]; if (!scratch) { + LLError::LLUserWarningMsg::showOutOfMemory(); LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32)) << " bytes for a manual image W" << width << " H" << height << LL_ENDL; } @@ -1457,6 +1459,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt scratch = new(std::nothrow) U32[width * height]; if (!scratch) { + LLError::LLUserWarningMsg::showOutOfMemory(); LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32)) << " bytes for a manual image W" << width << " H" << height << LL_ENDL; } |