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

diff --git a/indra/llui/llcallbackmap.h b/indra/llui/llcallbackmap.h
index 0a10877c09..07775dc30f 100644
--- a/indra/llui/llcallbackmap.h
+++ b/indra/llui/llcallbackmap.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcallbackmap.h
  * @brief LLCallbackMap base class
  *
  * $LicenseInfo:firstyear=2006&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,25 +34,25 @@
 class LLCallbackMap
 {
 public:
-	// callback definition.
-	typedef boost::function<void* (void* data)> callback_t;
-	
-	typedef std::map<std::string, LLCallbackMap> map_t;
-	typedef map_t::iterator map_iter_t;
-	typedef map_t::const_iterator map_const_iter_t;
-	
-	template <class T>
-	static void* buildPanel(void* data)
-	{
-		T* panel = new T();
-		return (void*)panel;
-	}
-	
-	LLCallbackMap() : mCallback(NULL), mData(NULL) { }
-	LLCallbackMap(callback_t callback, void* data = NULL) : mCallback(callback), mData(data) { }
-
-	callback_t	mCallback;
-	void*		mData;
+    // callback definition.
+    typedef boost::function<void* (void* data)> callback_t;
+
+    typedef std::map<std::string, LLCallbackMap> map_t;
+    typedef map_t::iterator map_iter_t;
+    typedef map_t::const_iterator map_const_iter_t;
+
+    template <class T>
+    static void* buildPanel(void* data)
+    {
+        T* panel = new T();
+        return (void*)panel;
+    }
+
+    LLCallbackMap() : mCallback(NULL), mData(NULL) { }
+    LLCallbackMap(callback_t callback, void* data = NULL) : mCallback(callback), mData(data) { }
+
+    callback_t  mCallback;
+    void*       mData;
 };
 
 #endif // LLCALLBACKMAP_H