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, 21 insertions, 21 deletions

diff --git a/indra/llcommon/llcallbacklist.h b/indra/llcommon/llcallbacklist.h
index 89716cd74c..d6c415f7c5 100644
--- a/indra/llcommon/llcallbacklist.h
+++ b/indra/llcommon/llcallbacklist.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcallbacklist.h
  * @brief A simple list of callback functions to call.
  *
  * $LicenseInfo:firstyear=2001&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,29 +34,29 @@
 class LLCallbackList
 {
 public:
-	typedef void (*callback_t)(void*);
+    typedef void (*callback_t)(void*);
+
+    typedef std::pair< callback_t,void* >   callback_pair_t;
+    // NOTE: It is confirmed that we DEPEND on the order provided by using a list :(
+    //
+    typedef std::list< callback_pair_t >    callback_list_t;
 
-	typedef std::pair< callback_t,void* >	callback_pair_t;
-	// NOTE: It is confirmed that we DEPEND on the order provided by using a list :(
-	//
-	typedef std::list< callback_pair_t >	callback_list_t; 
-	
-	LLCallbackList();
-	~LLCallbackList();
+    LLCallbackList();
+    ~LLCallbackList();
 
-	void addFunction( callback_t func, void *data = NULL );			// register a callback, which will be called as func(data)
-	bool containsFunction( callback_t func, void *data = NULL );	// true if list already contains the function/data pair
-	bool deleteFunction( callback_t func, void *data = NULL );		// removes the first instance of this function/data pair from the list, false if not found
-	void callFunctions();														// calls all functions
-	void deleteAllFunctions();
+    void addFunction( callback_t func, void *data = NULL );         // register a callback, which will be called as func(data)
+    bool containsFunction( callback_t func, void *data = NULL );    // true if list already contains the function/data pair
+    bool deleteFunction( callback_t func, void *data = NULL );      // removes the first instance of this function/data pair from the list, false if not found
+    void callFunctions();                                                       // calls all functions
+    void deleteAllFunctions();
 
-	static void test();
+    static void test();
 
 protected:
 
-	inline callback_list_t::iterator find(callback_t func, void *data);
+    inline callback_list_t::iterator find(callback_t func, void *data);
 
-	callback_list_t	mCallbackList;
+    callback_list_t mCallbackList;
 };
 
 typedef boost::function<void ()> nullary_func_t;