1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index a5f05d4380..9b16711b85 100644
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -96,15 +96,14 @@ public:
     static void initClass(bool use_new_byte_range = false, S32 minimal_reverse_byte_range_percent = 75);
     static void cleanupClass();
 
-    static const std::string& getLastError();
+    static const std::string& getLastThreadError();
     static void setLastError(const std::string& message);
 
     static bool useNewByteRange() { return sUseNewByteRange; }
     static S32  getReverseByteRangePercent() { return sMinimalReverseByteRangePercent; }
 
 protected:
-    static LLMutex* sMutex;
-    static std::string sLastErrorMessage;
+    static thread_local std::string sLastThreadErrorMessage;
     static bool sUseNewByteRange;
     static S32  sMinimalReverseByteRangePercent;
 };