Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 26 insertions, 26 deletions

diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h
index b4ab9432e6..8c43a7c32c 100644
--- a/indra/llimage/llimageworker.h
+++ b/indra/llimage/llimageworker.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llimageworker.h
  * @brief Object for managing images and their textures.
  *
  * $LicenseInfo:firstyear=2000&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -34,33 +34,33 @@
 class LLImageDecodeThread
 {
 public:
-	class Responder : public LLThreadSafeRefCount
-	{
-	protected:
-		virtual ~Responder();
-	public:
-		virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux, U32 request_id) = 0;
-	};
+    class Responder : public LLThreadSafeRefCount
+    {
+    protected:
+        virtual ~Responder();
+    public:
+        virtual void completed(bool success, const std::string& error_message, LLImageRaw* raw, LLImageRaw* aux, U32 request_id) = 0;
+    };
 
 public:
-	LLImageDecodeThread(bool threaded = true);
-	virtual ~LLImageDecodeThread();
+    LLImageDecodeThread(bool threaded = true);
+    virtual ~LLImageDecodeThread();
 
-	// meant to resemble LLQueuedThread::handle_t
-	typedef U32 handle_t;
-	handle_t decodeImage(const LLPointer<LLImageFormatted>& image,
-						 S32 discard, BOOL needs_aux,
-						 const LLPointer<Responder>& responder);
-	size_t getPending();
-	size_t update(F32 max_time_ms);
+    // meant to resemble LLQueuedThread::handle_t
+    typedef U32 handle_t;
+    handle_t decodeImage(const LLPointer<LLImageFormatted>& image,
+                         S32 discard, BOOL needs_aux,
+                         const LLPointer<Responder>& responder);
+    size_t getPending();
+    size_t update(F32 max_time_ms);
     S32 getTotalDecodeCount() { return mDecodeCount; }
-	void shutdown();
+    void shutdown();
 
 private:
-	// As of SL-17483, LLImageDecodeThread is no longer itself an
-	// LLQueuedThread - instead this is the API by which we submit work to the
-	// "ImageDecode" ThreadPool.
-	std::unique_ptr<LL::ThreadPool> mThreadPool;
+    // As of SL-17483, LLImageDecodeThread is no longer itself an
+    // LLQueuedThread - instead this is the API by which we submit work to the
+    // "ImageDecode" ThreadPool.
+    std::unique_ptr<LL::ThreadPool> mThreadPool;
     LLAtomicU32 mDecodeCount;
 };