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

diff --git a/indra/newview/lllistview.cpp b/indra/newview/lllistview.cpp
index 8fc3ad63bd..8e923f6eb7 100644
--- a/indra/newview/lllistview.cpp
+++ b/indra/newview/lllistview.cpp
@@ -1,26 +1,26 @@
-/** 
+/**
  * @file lllistview.cpp
- * @brief UI widget containing a scrollable, possibly hierarchical list of 
+ * @brief UI widget containing a scrollable, possibly hierarchical list of
  * folders (LLListViewFolder) and items (LLListViewItem).
  *
  * $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$
  */
@@ -29,31 +29,31 @@
 #include "lllistview.h"
 
 #include "lltextbox.h"
-#include "lluictrlfactory.h"	// LLDefaultChildRegistry
+#include "lluictrlfactory.h"    // LLDefaultChildRegistry
 
 // linker optimizes this out on Windows until there is a real reference
 // to this file
 static LLDefaultChildRegistry::Register<LLListView> r("list_view");
 
 LLListView::Params::Params()
-:	bg_color("bg_color"),
-	fg_selected_color("fg_selected_color"),
-	bg_selected_color("bg_selected_color")
+:   bg_color("bg_color"),
+    fg_selected_color("fg_selected_color"),
+    bg_selected_color("bg_selected_color")
 {}
 
 LLListView::LLListView(const Params& p)
-:	LLUICtrl(p),
-	mLabel(NULL),
-	mBgColor(p.bg_color()),
-	mFgSelectedColor(p.fg_selected_color()),
-	mBgSelectedColor(p.bg_selected_color())
+:   LLUICtrl(p),
+    mLabel(NULL),
+    mBgColor(p.bg_color()),
+    mFgSelectedColor(p.fg_selected_color()),
+    mBgSelectedColor(p.bg_selected_color())
 {
-	LLRect label_rect(0, 20, 300, 0);
-	LLTextBox::Params text_box_params;
-	text_box_params.rect(label_rect);
-	text_box_params.initial_value("This is a list-view");
-	mLabel = LLUICtrlFactory::create<LLTextBox>(text_box_params);
-	addChild(mLabel);
+    LLRect label_rect(0, 20, 300, 0);
+    LLTextBox::Params text_box_params;
+    text_box_params.rect(label_rect);
+    text_box_params.initial_value("This is a list-view");
+    mLabel = LLUICtrlFactory::create<LLTextBox>(text_box_params);
+    addChild(mLabel);
 }
 
 LLListView::~LLListView()
@@ -63,5 +63,5 @@ LLListView::~LLListView()
 // placeholder for setting a property
 void LLListView::setString(const std::string& s)
 {
-	mLabel->setValue( LLSD(s) );
+    mLabel->setValue( LLSD(s) );
 }