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

diff --git a/indra/newview/llfloaterpreviewtrash.cpp b/indra/newview/llfloaterpreviewtrash.cpp
index cf4e3f04e6..af33e43109 100644
--- a/indra/newview/llfloaterpreviewtrash.cpp
+++ b/indra/newview/llfloaterpreviewtrash.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterpreviewtrash.cpp
  * @author AndreyK Productengine
  * @brief LLFloaterPreviewTrash class implementation
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2004&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$
  */
@@ -33,7 +33,7 @@
 #include "llfloaterreg.h"
 
 LLFloaterPreviewTrash::LLFloaterPreviewTrash(const LLSD& key)
-:	LLFloater(key)
+:   LLFloater(key)
 {
 }
 
@@ -43,13 +43,13 @@ BOOL LLFloaterPreviewTrash::postBuild()
         boost::bind(&LLFloaterPreviewTrash::onClickEmpty, this));
     getChild<LLUICtrl>("cancel_btn")->setCommitCallback(
         boost::bind(&LLFloaterPreviewTrash::onClickCancel, this));
-	// Always center the dialog.  User can change the size,
-	// but purchases are important and should be center screen.
-	// This also avoids problems where the user resizes the application window
-	// mid-session and the saved rect is off-center.
-	center();
-	
-	return TRUE;
+    // Always center the dialog.  User can change the size,
+    // but purchases are important and should be center screen.
+    // This also avoids problems where the user resizes the application window
+    // mid-session and the saved rect is off-center.
+    center();
+
+    return TRUE;
 }
 
 LLFloaterPreviewTrash::~LLFloaterPreviewTrash()
@@ -60,23 +60,23 @@ LLFloaterPreviewTrash::~LLFloaterPreviewTrash()
 // static
 void LLFloaterPreviewTrash::show()
 {
-	LLFloaterReg::showTypedInstance<LLFloaterPreviewTrash>("preview_trash", LLSD(), TRUE);
+    LLFloaterReg::showTypedInstance<LLFloaterPreviewTrash>("preview_trash", LLSD(), TRUE);
 }
 
 // static
 bool LLFloaterPreviewTrash::isVisible()
 {
-	return LLFloaterReg::instanceVisible("preview_trash");
+    return LLFloaterReg::instanceVisible("preview_trash");
 }
 
 
 void LLFloaterPreviewTrash::onClickEmpty()
 {
-	gInventory.emptyFolderType("PurgeSelectedItems", LLFolderType::FT_TRASH);
-	closeFloater();
+    gInventory.emptyFolderType("PurgeSelectedItems", LLFolderType::FT_TRASH);
+    closeFloater();
 }
 
 void LLFloaterPreviewTrash::onClickCancel()
 {
-	closeFloater();
+    closeFloater();
 }