1 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/llimage/llimagejpeg.cpp b/linden/indra/llimage/llimagejpeg.cpp
index 68529b6..afb3368 100644
--- a/linden/indra/llimage/llimagejpeg.cpp
+++ b/linden/indra/llimage/llimagejpeg.cpp
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -465,7 +465,8 @@ void LLImageJPEG::errorOutputMessage( j_common_ptr cinfo )
         char buffer[JMSG_LENGTH_MAX];   /* Flawfinder: ignore */
         (*cinfo->err->format_message) (cinfo, buffer);
 
-        ((LLImageJPEG*) cinfo->client_data)->setLastError( buffer );
+        std::string error = buffer ;
+        LLImage::setLastError(error);
 
         BOOL is_decode = (cinfo->is_decompressor != 0);
         llwarns << "LLImageJPEG " << (is_decode ? "decode " : "encode ") << " failed: " << buffer << llendl;