Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 82 insertions, 82 deletions

diff --git a/indra/newview/llfloaterpreviewtrash.cpp b/indra/newview/llfloaterpreviewtrash.cpp
index bd50a6b821..5ec9843c77 100644
--- a/indra/newview/llfloaterpreviewtrash.cpp
+++ b/indra/newview/llfloaterpreviewtrash.cpp
@@ -1,82 +1,82 @@
-/** 
- * @file llfloaterpreviewtrash.cpp
- * @author AndreyK Productengine
- * @brief LLFloaterPreviewTrash class implementation
- *
- * $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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterpreviewtrash.h"
-
-#include "llinventoryfunctions.h"
-#include "llfloaterreg.h"
-
-LLFloaterPreviewTrash::LLFloaterPreviewTrash(const LLSD& key)
-:	LLFloater(key)
-{
-}
-
-bool LLFloaterPreviewTrash::postBuild()
-{
-    getChild<LLUICtrl>("empty_btn")->setCommitCallback(
-        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;
-}
-
-LLFloaterPreviewTrash::~LLFloaterPreviewTrash()
-{
-}
-
-
-// static
-void LLFloaterPreviewTrash::show()
-{
-	LLFloaterReg::showTypedInstance<LLFloaterPreviewTrash>("preview_trash", LLSD(), true);
-}
-
-// static
-bool LLFloaterPreviewTrash::isVisible()
-{
-	return LLFloaterReg::instanceVisible("preview_trash");
-}
-
-
-void LLFloaterPreviewTrash::onClickEmpty()
-{
-	gInventory.emptyFolderType("PurgeSelectedItems", LLFolderType::FT_TRASH);
-	closeFloater();
-}
-
-void LLFloaterPreviewTrash::onClickCancel()
-{
-	closeFloater();
-}
+/**

+ * @file llfloaterpreviewtrash.cpp

+ * @author AndreyK Productengine

+ * @brief LLFloaterPreviewTrash class implementation

+ *

+ * $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$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llfloaterpreviewtrash.h"

+

+#include "llinventoryfunctions.h"

+#include "llfloaterreg.h"

+

+LLFloaterPreviewTrash::LLFloaterPreviewTrash(const LLSD& key)

+:   LLFloater(key)

+{

+}

+

+bool LLFloaterPreviewTrash::postBuild()

+{

+    getChild<LLUICtrl>("empty_btn")->setCommitCallback(

+        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;

+}

+

+LLFloaterPreviewTrash::~LLFloaterPreviewTrash()

+{

+}

+

+

+// static

+void LLFloaterPreviewTrash::show()

+{

+    LLFloaterReg::showTypedInstance<LLFloaterPreviewTrash>("preview_trash", LLSD(), true);

+}

+

+// static

+bool LLFloaterPreviewTrash::isVisible()

+{

+    return LLFloaterReg::instanceVisible("preview_trash");

+}

+

+

+void LLFloaterPreviewTrash::onClickEmpty()

+{

+    gInventory.emptyFolderType("PurgeSelectedItems", LLFolderType::FT_TRASH);

+    closeFloater();

+}

+

+void LLFloaterPreviewTrash::onClickCancel()

+{

+    closeFloater();

+}