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

diff --git a/indra/newview/llgroupiconctrl.cpp b/indra/newview/llgroupiconctrl.cpp
index 7c2a3cad43..af2b3c10c5 100644
--- a/indra/newview/llgroupiconctrl.cpp
+++ b/indra/newview/llgroupiconctrl.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llgroupiconctrl.cpp
  * @brief LLGroupIconCtrl class implementation
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -34,9 +34,9 @@
 static LLDefaultChildRegistry::Register<LLGroupIconCtrl> g_i("group_icon");
 
 LLGroupIconCtrl::Params::Params()
-:	group_id("group_id"),
-	draw_tooltip("draw_tooltip", true),
-	default_icon_name("default_icon_name")
+:   group_id("group_id"),
+    draw_tooltip("draw_tooltip", true),
+    default_icon_name("default_icon_name")
 {
     changeDefault(min_width, 32);
     changeDefault(min_height, 32);
@@ -44,12 +44,12 @@ LLGroupIconCtrl::Params::Params()
 
 
 LLGroupIconCtrl::LLGroupIconCtrl(const LLGroupIconCtrl::Params& p)
-:	LLIconCtrl(p),
-	mGroupId(LLUUID::null),
-	mDrawTooltip(p.draw_tooltip),
-	mDefaultIconName(p.default_icon_name)
+:   LLIconCtrl(p),
+    mGroupId(LLUUID::null),
+    mDrawTooltip(p.draw_tooltip),
+    mDefaultIconName(p.default_icon_name)
 {
-	mPriority = LLViewerFetchedTexture::BOOST_ICON;
+    mPriority = LLViewerFetchedTexture::BOOST_ICON;
 
     // don't request larger image then necessary to save gl memory,
     // but ensure that quality is sufficient
@@ -57,21 +57,21 @@ LLGroupIconCtrl::LLGroupIconCtrl(const LLGroupIconCtrl::Params& p)
     mMaxHeight = llmax((S32)p.min_height, rect.getHeight());
     mMaxWidth = llmax((S32)p.min_width, rect.getWidth());
 
-	if (p.group_id.isProvided())
-	{
-		LLSD value(p.group_id);
-		setValue(value);
-	}
-	else
-	{
-		//TODO: Consider implementing dedicated setDefault() function instead of passing priority for local file
-		LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
-	}
+    if (p.group_id.isProvided())
+    {
+        LLSD value(p.group_id);
+        setValue(value);
+    }
+    else
+    {
+        //TODO: Consider implementing dedicated setDefault() function instead of passing priority for local file
+        LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
+    }
 }
 
 LLGroupIconCtrl::~LLGroupIconCtrl()
 {
-	LLGroupMgr::getInstance()->removeObserver(this);
+    LLGroupMgr::getInstance()->removeObserver(this);
 }
 
 void LLGroupIconCtrl::setIconId(const LLUUID& icon_id)
@@ -88,57 +88,57 @@ void LLGroupIconCtrl::setIconId(const LLUUID& icon_id)
 
 void LLGroupIconCtrl::setValue(const LLSD& value)
 {
-	if (value.isUUID())
-	{
-		LLGroupMgr* gm = LLGroupMgr::getInstance();
-		if (mGroupId.notNull())
-		{
-			gm->removeObserver(this);
-		}
+    if (value.isUUID())
+    {
+        LLGroupMgr* gm = LLGroupMgr::getInstance();
+        if (mGroupId.notNull())
+        {
+            gm->removeObserver(this);
+        }
 
-		if (mGroupId != value.asUUID())
-		{
-			mGroupId = value.asUUID();
-			mID = mGroupId; // set LLGroupMgrObserver::mID to make callbacks work
+        if (mGroupId != value.asUUID())
+        {
+            mGroupId = value.asUUID();
+            mID = mGroupId; // set LLGroupMgrObserver::mID to make callbacks work
 
-			// Check if cache already contains image_id for that group
-			if (!updateFromCache())
-			{
-				LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
-				gm->addObserver(this);
-				gm->sendGroupPropertiesRequest(mGroupId);
-			}
-		}
-	}
-	else
-	{
-		LLIconCtrl::setValue(value);
-	}
+            // Check if cache already contains image_id for that group
+            if (!updateFromCache())
+            {
+                LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
+                gm->addObserver(this);
+                gm->sendGroupPropertiesRequest(mGroupId);
+            }
+        }
+    }
+    else
+    {
+        LLIconCtrl::setValue(value);
+    }
 }
 
 void LLGroupIconCtrl::changed(LLGroupChange gc)
 {
-	if (GC_PROPERTIES == gc)
-	{
-		updateFromCache();
-	}
+    if (GC_PROPERTIES == gc)
+    {
+        updateFromCache();
+    }
 }
 
 bool LLGroupIconCtrl::updateFromCache()
 {
-	LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(mGroupId);
-	if (!group_data) return false;
+    LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(mGroupId);
+    if (!group_data) return false;
 
-	setIconId(group_data->mInsigniaID);
+    setIconId(group_data->mInsigniaID);
 
-	if (mDrawTooltip && !group_data->mName.empty())
-	{
-		setToolTip(group_data->mName);
-	}
-	else
-	{
-		setToolTip(LLStringUtil::null);
-	}
-	return true;
+    if (mDrawTooltip && !group_data->mName.empty())
+    {
+        setToolTip(group_data->mName);
+    }
+    else
+    {
+        setToolTip(LLStringUtil::null);
+    }
+    return true;
 }