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

diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h
index 7c2f0705b7..b4f08be00b 100644
--- a/indra/newview/llfloatertos.h
+++ b/indra/newview/llfloatertos.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloatertos.h
  * @brief Terms of Service Agreement dialog
  *
  * $LicenseInfo:firstyear=2003&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$
  */
@@ -39,37 +39,37 @@ class LLRadioGroup;
 class LLTextEditor;
 class LLUUID;
 
-class LLFloaterTOS : 
-	public LLModalDialog,
-	public LLViewerMediaObserver
+class LLFloaterTOS :
+    public LLModalDialog,
+    public LLViewerMediaObserver
 {
 public:
-	LLFloaterTOS(const LLSD& data);
-	virtual ~LLFloaterTOS();
+    LLFloaterTOS(const LLSD& data);
+    virtual ~LLFloaterTOS();
+
+    BOOL postBuild();
 
-	BOOL postBuild();
-	
-	virtual void draw();
+    virtual void draw();
 
-	static void		updateAgree( LLUICtrl *, void* userdata );
-	static void		onContinue( void* userdata );
-	static void		onCancel( void* userdata );
+    static void     updateAgree( LLUICtrl *, void* userdata );
+    static void     onContinue( void* userdata );
+    static void     onCancel( void* userdata );
 
-	void			setSiteIsAlive( bool alive );
+    void            setSiteIsAlive( bool alive );
 
-	void			updateAgreeEnabled(bool enabled);
+    void            updateAgreeEnabled(bool enabled);
 
-	// inherited from LLViewerMediaObserver
-	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+    // inherited from LLViewerMediaObserver
+    /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
 
 private:
     static void testSiteIsAliveCoro(LLHandle<LLFloater> handle, std::string url);
 
-	std::string		mMessage;
-	bool			mLoadingScreenLoaded;
-	bool			mSiteAlive;
-	bool			mRealNavigateBegun;
-	std::string		mReplyPumpName;
+    std::string     mMessage;
+    bool            mLoadingScreenLoaded;
+    bool            mSiteAlive;
+    bool            mRealNavigateBegun;
+    std::string     mReplyPumpName;
 
 
 };