From 305fe845c6058177c84c7f8d49c3faedec2e8282 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:16:57 +0200
Subject: SL-20779 More reliable decode and encode error logging (#615)

---
 indra/llimage/llimage.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'indra/llimage/llimage.cpp')

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 031471d1fe..9c0cc8d760 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -584,8 +584,7 @@ static void bilinear_scale(const U8 *src, U32 srcW, U32 srcH, U32 srcCh, U32 src
 //---------------------------------------------------------------------------
 
 //static
-std::string LLImage::sLastErrorMessage;
-LLMutex* LLImage::sMutex = NULL;
+thread_local std::string LLImage::sLastThreadErrorMessage;
 bool LLImage::sUseNewByteRange = false;
 S32  LLImage::sMinimalReverseByteRangePercent = 75;
 
@@ -594,28 +593,24 @@ void LLImage::initClass(bool use_new_byte_range, S32 minimal_reverse_byte_range_
 {
 	sUseNewByteRange = use_new_byte_range;
     sMinimalReverseByteRangePercent = minimal_reverse_byte_range_percent;
-	sMutex = new LLMutex();
 }
 
 //static
 void LLImage::cleanupClass()
 {
-	delete sMutex;
-	sMutex = NULL;
 }
 
 //static
-const std::string& LLImage::getLastError()
+const std::string& LLImage::getLastThreadError()
 {
 	static const std::string noerr("No Error");
-	return sLastErrorMessage.empty() ? noerr : sLastErrorMessage;
+	return sLastThreadErrorMessage.empty() ? noerr : sLastThreadErrorMessage;
 }
 
 //static
 void LLImage::setLastError(const std::string& message)
 {
-	LLMutexLock m(sMutex);
-	sLastErrorMessage = message;
+    sLastThreadErrorMessage = message;
 }
 
 //---------------------------------------------------------------------------
-- 
cgit v1.2.3