From 79aede07e31f428e8adc0a2d45994450991afeb5 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 22 Oct 2024 16:00:33 +0100
Subject: [PATCH] FIRE-34374 - additional bypass of LL_ERR

---
 indra/llrender/llimagegl.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 826861d64c..f106619d7a 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1248,7 +1248,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
                     //           << " bytes for a manual image W" << width << " H" << height << LL_ENDL;                    
                     LL_WARNS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
                               << " bytes for a manual image W" << width << " H" << height << LL_ENDL;
-                        return;
+                    return;
                     // </FS:Beq>
                 }
 
@@ -1274,8 +1274,13 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
                 if (!scratch)
                 {
                     LLError::LLUserWarningMsg::showOutOfMemory();
-                    LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
+                    // <FS:Beq> FIRE-34374 - OOM Crash 80% of which are in render debug text 
+                    // LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
+                    //     << " bytes for a manual image W" << width << " H" << height << LL_ENDL;
+                    LL_WARNS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
                         << " bytes for a manual image W" << width << " H" << height << LL_ENDL;
+                    return;
+                    // </FS:Beq>
                 }
 
                 U32 pixel_count = (U32)(width * height);