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/newview/llappviewerlinux.h b/indra/newview/llappviewerlinux.h
index abe62c9289..460ca721f1 100644
--- a/indra/newview/llappviewerlinux.h
+++ b/indra/newview/llappviewerlinux.h
@@ -5,24 +5,24 @@
  * $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$
- */ 
+ */
 
 #ifndef LL_LLAPPVIEWERLINUX_H
 #define LL_LLAPPVIEWERLINUX_H
@@ -36,27 +36,27 @@ class LLCommandLineParser;
 class LLAppViewerLinux : public LLAppViewer
 {
 public:
-	LLAppViewerLinux();
-	virtual ~LLAppViewerLinux();
+    LLAppViewerLinux();
+    virtual ~LLAppViewerLinux();
 
-	//
-	// Main application logic
-	//
-	virtual bool init();			// Override to do application initialization
-	std::string generateSerialNumber();
-	bool setupSLURLHandler();
+    //
+    // Main application logic
+    //
+    virtual bool init();            // Override to do application initialization
+    std::string generateSerialNumber();
+    bool setupSLURLHandler();
 
 protected:
-	virtual bool beingDebugged();
-	
-	virtual bool restoreErrorTrap();
-	virtual void initCrashReporting(bool reportFreeze);
+    virtual bool beingDebugged();
+
+    virtual bool restoreErrorTrap();
+    virtual void initCrashReporting(bool reportFreeze);
 
-	virtual void initLoggingAndGetLastDuration();
-	virtual bool initParseCommandLine(LLCommandLineParser& clp);
+    virtual void initLoggingAndGetLastDuration();
+    virtual bool initParseCommandLine(LLCommandLineParser& clp);
 
-	virtual bool initSLURLHandler();
-	virtual bool sendURLToOtherInstance(const std::string& url);
+    virtual bool initSLURLHandler();
+    virtual bool sendURLToOtherInstance(const std::string& url);
 };
 
 #endif // LL_LLAPPVIEWERLINUX_H