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

diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp
index 06fac190ed..5132d33bbf 100644
--- a/indra/llui/llclipboard.cpp
+++ b/indra/llui/llclipboard.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llclipboard.cpp
  * @brief LLClipboard base class
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -35,121 +35,121 @@
 #include "llwindow.h"
 
 LLClipboard::LLClipboard() :
-	mGeneration(0)
+    mGeneration(0)
 {
-	reset();
+    reset();
 }
 
 LLClipboard::~LLClipboard()
 {
-	reset();
+    reset();
 }
 
 void LLClipboard::reset()
 {
-	// Increment the clipboard count
-	mGeneration++;
-	// Clear the clipboard
-	mObjects.clear();
-	mCutMode = false;
-	mString = LLWString();
+    // Increment the clipboard count
+    mGeneration++;
+    // Clear the clipboard
+    mObjects.clear();
+    mCutMode = false;
+    mString = LLWString();
 }
 
 // Copy the input uuid to the LL clipboard
 bool LLClipboard::copyToClipboard(const LLUUID& src, const LLAssetType::EType type)
 {
-	reset();
-	return addToClipboard(src, type);
+    reset();
+    return addToClipboard(src, type);
 }
 
 // Add the input uuid to the LL clipboard
 // Convert the uuid to string and concatenate that string to the system clipboard if legit
 bool LLClipboard::addToClipboard(const LLUUID& src, const LLAssetType::EType type)
 {
-	bool res = false;
-	if (src.notNull())
-	{
-		res = true;
-		if (LLAssetType::lookupIsAssetIDKnowable(type))
-		{
-			LLWString source = utf8str_to_wstring(src.asString());
-			res = addToClipboard(source, 0, source.size());
-		}
-		if (res)
-		{
-			mObjects.push_back(src);
-			mGeneration++;
-		}
-	}
-	return res;
+    bool res = false;
+    if (src.notNull())
+    {
+        res = true;
+        if (LLAssetType::lookupIsAssetIDKnowable(type))
+        {
+            LLWString source = utf8str_to_wstring(src.asString());
+            res = addToClipboard(source, 0, source.size());
+        }
+        if (res)
+        {
+            mObjects.push_back(src);
+            mGeneration++;
+        }
+    }
+    return res;
 }
 
 bool LLClipboard::pasteFromClipboard(std::vector<LLUUID>& inv_objects) const
 {
-	bool res = false;
-	S32 count = mObjects.size();
-	inv_objects.reserve(inv_objects.size() + count);
-	if (count > 0)
-	{
-		res = true;
-		inv_objects.clear();
-		for (S32 i = 0; i < count; i++)
-		{
-			inv_objects.push_back(mObjects[i]);
-		}
-	}
-	return res;
+    bool res = false;
+    S32 count = mObjects.size();
+    inv_objects.reserve(inv_objects.size() + count);
+    if (count > 0)
+    {
+        res = true;
+        inv_objects.clear();
+        for (S32 i = 0; i < count; i++)
+        {
+            inv_objects.push_back(mObjects[i]);
+        }
+    }
+    return res;
 }
 
 // Returns true if the LL Clipboard has pasteable items in it
 bool LLClipboard::hasContents() const
 {
-	return (mObjects.size() > 0);
+    return (mObjects.size() > 0);
 }
 
 // Returns true if the input uuid is in the list of clipboard objects
 bool LLClipboard::isOnClipboard(const LLUUID& object) const
 {
-	std::vector<LLUUID>::const_iterator iter = std::find(mObjects.begin(), mObjects.end(), object);
-	return (iter != mObjects.end());
+    std::vector<LLUUID>::const_iterator iter = std::find(mObjects.begin(), mObjects.end(), object);
+    return (iter != mObjects.end());
 }
 
 // Copy the input string to the LL and the system clipboard
 bool LLClipboard::copyToClipboard(const LLWString &src, S32 pos, S32 len, bool use_primary)
 {
-	return addToClipboard(src, pos, len, use_primary);
+    return addToClipboard(src, pos, len, use_primary);
 }
 
 // Concatenate the input string to the LL and the system clipboard
 bool LLClipboard::addToClipboard(const LLWString &src, S32 pos, S32 len, bool use_primary)
 {
-	try
-	{
-		mString = src.substr(pos, len);
-	}
-	catch (const std::exception& e)
-	{
-		LL_WARNS() << "Can't add the substring to clipboard: " << e.what() << LL_ENDL;
-		return false;
-	}
-	return (use_primary ? LLView::getWindow()->copyTextToPrimary(mString) : LLView::getWindow()->copyTextToClipboard(mString));
+    try
+    {
+        mString = src.substr(pos, len);
+    }
+    catch (const std::exception& e)
+    {
+        LL_WARNS() << "Can't add the substring to clipboard: " << e.what() << LL_ENDL;
+        return false;
+    }
+    return (use_primary ? LLView::getWindow()->copyTextToPrimary(mString) : LLView::getWindow()->copyTextToClipboard(mString));
 }
 
 // Copy the System clipboard to the output string.
 // Manage the LL Clipboard / System clipboard consistency
 bool LLClipboard::pasteFromClipboard(LLWString &dst, bool use_primary)
 {
-	bool res = (use_primary ? LLView::getWindow()->pasteTextFromPrimary(dst) : LLView::getWindow()->pasteTextFromClipboard(dst));
-	if (res)
-	{
-		mString = dst;
-	}
-	return res;
+    bool res = (use_primary ? LLView::getWindow()->pasteTextFromPrimary(dst) : LLView::getWindow()->pasteTextFromClipboard(dst));
+    if (res)
+    {
+        mString = dst;
+    }
+    return res;
 }
 
 // Return true if there's something on the System clipboard
 bool LLClipboard::isTextAvailable(bool use_primary) const
 {
-	return (use_primary ? LLView::getWindow()->isPrimaryTextAvailable() : LLView::getWindow()->isClipboardTextAvailable());
+    return (use_primary ? LLView::getWindow()->isPrimaryTextAvailable() : LLView::getWindow()->isClipboardTextAvailable());
 }