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

diff --git a/indra/llcommon/llmetrics.h b/indra/llcommon/llmetrics.h
index 85a6986049..a6df49fc6a 100644
--- a/indra/llcommon/llmetrics.h
+++ b/indra/llcommon/llmetrics.h
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2007&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$
  */
@@ -35,25 +35,25 @@ class LLSD;
 class LL_COMMON_API LLMetrics
 {
 public:
-	LLMetrics();
-	virtual ~LLMetrics();
+    LLMetrics();
+    virtual ~LLMetrics();
 
-	// Adds this event to aggregate totals and records details to syslog (LL_INFOS())
-	virtual void recordEventDetails(const std::string& location, 
-						const std::string& mesg, 
-						bool success, 
-						LLSD stats);
+    // Adds this event to aggregate totals and records details to syslog (LL_INFOS())
+    virtual void recordEventDetails(const std::string& location,
+                        const std::string& mesg,
+                        bool success,
+                        LLSD stats);
 
-	// Adds this event to aggregate totals
-	virtual void recordEvent(const std::string& location, const std::string& mesg, bool success);
+    // Adds this event to aggregate totals
+    virtual void recordEvent(const std::string& location, const std::string& mesg, bool success);
 
-	// Prints aggregate totals and resets the counts.
-	virtual void printTotals(LLSD meta);
+    // Prints aggregate totals and resets the counts.
+    virtual void printTotals(LLSD meta);
 
 
 private:
-	
-	LLMetricsImpl* mImpl;
+
+    LLMetricsImpl* mImpl;
 };
 
 #endif