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

diff --git a/indra/newview/llpanellandmedia.h b/indra/newview/llpanellandmedia.h
index 63cfa01470..2bcd1fa14d 100644
--- a/indra/newview/llpanellandmedia.h
+++ b/indra/newview/llpanellandmedia.h
@@ -6,21 +6,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$
  */
@@ -31,43 +31,43 @@
 #include "lllineeditor.h"
 #include "llpanel.h"
 #include "llparcelselection.h"
-#include "lluifwd.h"	// widget pointer types
+#include "lluifwd.h"    // widget pointer types
 
 class LLPanelLandMedia
-:	public LLPanel
+:   public LLPanel
 {
 public:
-	LLPanelLandMedia(LLSafeHandle<LLParcelSelection>& parcelp);
-	/*virtual*/ ~LLPanelLandMedia();
-	/*virtual*/ BOOL postBuild();
-	void refresh();
-	void setMediaType(const std::string& media_type);
-	void setMediaURL(const std::string& media_type);
-	std::string getMediaURL();
+    LLPanelLandMedia(LLSafeHandle<LLParcelSelection>& parcelp);
+    /*virtual*/ ~LLPanelLandMedia();
+    /*virtual*/ BOOL postBuild();
+    void refresh();
+    void setMediaType(const std::string& media_type);
+    void setMediaURL(const std::string& media_type);
+    std::string getMediaURL();
 
 private:
-	void populateMIMECombo();
-	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
-	static void onCommitType(LLUICtrl* ctrl, void *userdata);
-	static void onSetBtn(void* userdata);
-	static void onResetBtn(void* userdata);
-	
+    void populateMIMECombo();
+    static void onCommitAny(LLUICtrl* ctrl, void *userdata);
+    static void onCommitType(LLUICtrl* ctrl, void *userdata);
+    static void onSetBtn(void* userdata);
+    static void onResetBtn(void* userdata);
+
 private:
-	LLLineEditor*	mMediaURLEdit;
-	LLLineEditor*	mMediaDescEdit;
-	LLComboBox*		mMediaTypeCombo;
-	LLButton*		mSetURLButton;
-	LLSpinCtrl*		mMediaHeightCtrl;
-	LLSpinCtrl*		mMediaWidthCtrl;
-	LLTextBox*		mMediaSizeCtrlLabel;
-	LLTextureCtrl*	mMediaTextureCtrl;
-	LLCheckBoxCtrl*	mMediaAutoScaleCheck;
-	LLCheckBoxCtrl*	mMediaLoopCheck;
-	LLHandle<LLFloater>	mURLEntryFloater;
+    LLLineEditor*   mMediaURLEdit;
+    LLLineEditor*   mMediaDescEdit;
+    LLComboBox*     mMediaTypeCombo;
+    LLButton*       mSetURLButton;
+    LLSpinCtrl*     mMediaHeightCtrl;
+    LLSpinCtrl*     mMediaWidthCtrl;
+    LLTextBox*      mMediaSizeCtrlLabel;
+    LLTextureCtrl*  mMediaTextureCtrl;
+    LLCheckBoxCtrl* mMediaAutoScaleCheck;
+    LLCheckBoxCtrl* mMediaLoopCheck;
+    LLHandle<LLFloater> mURLEntryFloater;
+
 
 
-	
-	LLSafeHandle<LLParcelSelection>&	mParcel;
+    LLSafeHandle<LLParcelSelection>&    mParcel;
 };
 
 #endif