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

diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h
index a82bc7a69b..4c3c0f3414 100644
--- a/indra/llcommon/lleventdispatcher.h
+++ b/indra/llcommon/lleventdispatcher.h
@@ -6,25 +6,25 @@
  *         useful when you have a single LLEventPump listener on which you can
  *         request different operations, vs. instantiating a different
  *         LLEventPump for each such operation.
- * 
+ *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -201,7 +201,7 @@ public:
     template <typename R, class CLASS, typename ARG,
               typename = typename std::enable_if<
                   ! std::is_same<typename std::decay<ARG>::type, LLSD>::value
-             >::type>    
+             >::type>
     void add(const std::string& name,
              const std::string& desc,
              R (CLASS::*method)(ARG))
@@ -213,7 +213,7 @@ public:
     template <typename R, class CLASS, typename ARG,
               typename = typename std::enable_if<
                   ! std::is_same<typename std::decay<ARG>::type, LLSD>::value
-             >::type>    
+             >::type>
     void add(const std::string& name,
              const std::string& desc,
              R (CLASS::*method)(ARG) const)
@@ -226,7 +226,7 @@ public:
     template <class CLASS, typename ARG,
               typename = typename std::enable_if<
                   ! std::is_same<typename std::decay<ARG>::type, LLSD>::value
-             >::type>    
+             >::type>
     void add(const std::string& name,
              const std::string& desc,
              void (CLASS::*method)(ARG))
@@ -238,7 +238,7 @@ public:
     template <class CLASS, typename ARG,
               typename = typename std::enable_if<
                   ! std::is_same<typename std::decay<ARG>::type, LLSD>::value
-             >::type>    
+             >::type>
     void add(const std::string& name,
              const std::string& desc,
              void (CLASS::*method)(ARG) const)
@@ -247,7 +247,7 @@ public:
     }
 
     // non-const binary (or more) method
-    template <typename R, class CLASS, typename ARG0, typename ARG1, typename... ARGS>    
+    template <typename R, class CLASS, typename ARG0, typename ARG1, typename... ARGS>
     void add(const std::string& name,
              const std::string& desc,
              R (CLASS::*method)(ARG0, ARG1, ARGS...))
@@ -256,7 +256,7 @@ public:
     }
 
     // const binary (or more) method
-    template <typename R, class CLASS, typename ARG0, typename ARG1, typename... ARGS>    
+    template <typename R, class CLASS, typename ARG0, typename ARG1, typename... ARGS>
     void add(const std::string& name,
              const std::string& desc,
              R (CLASS::*method)(ARG0, ARG1, ARGS...) const)
@@ -265,7 +265,7 @@ public:
     }
 
     // non-const binary (or more) method returning void
-    template <class CLASS, typename ARG0, typename ARG1, typename... ARGS>    
+    template <class CLASS, typename ARG0, typename ARG1, typename... ARGS>
     void add(const std::string& name,
              const std::string& desc,
              void (CLASS::*method)(ARG0, ARG1, ARGS...))
@@ -274,7 +274,7 @@ public:
     }
 
     // const binary (or more) method returning void
-    template <class CLASS, typename ARG0, typename ARG1, typename... ARGS>    
+    template <class CLASS, typename ARG0, typename ARG1, typename... ARGS>
     void add(const std::string& name,
              const std::string& desc,
              void (CLASS::*method)(ARG0, ARG1, ARGS...) const)
@@ -371,7 +371,7 @@ public:
              const InstanceGetter& getter, const LLSD& params,
              const LLSD& defaults=LLSD());
 
-    //@}    
+    //@}
 
     /// Unregister a callable
     bool remove(const std::string& name);