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

diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.cpp b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
index cbf6021119..d3d3468185 100644
--- a/indra/integration_tests/llui_libtest/llwidgetreg.cpp
+++ b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llwidgetreg.cpp
  *
  * $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$
  */
@@ -56,52 +56,52 @@
 
 void LLWidgetReg::initClass(bool register_widgets)
 {
-	// Only need to register if the Windows linker has optimized away the
-	// references to the object files.
-	if (register_widgets)
-	{
-		LLDefaultChildRegistry::Register<LLButton> button("button");
-		LLDefaultChildRegistry::Register<LLMenuButton> menu_button("menu_button");
-		LLDefaultChildRegistry::Register<LLCheckBoxCtrl> check_box("check_box");
-		LLDefaultChildRegistry::Register<LLComboBox> combo_box("combo_box");
-		LLDefaultChildRegistry::Register<LLFilterEditor> filter_editor("filter_editor");
-		LLDefaultChildRegistry::Register<LLFlyoutButton> flyout_button("flyout_button");
-		LLDefaultChildRegistry::Register<LLContainerView> container_view("container_view");
-		LLDefaultChildRegistry::Register<LLIconCtrl> icon("icon");
-		LLDefaultChildRegistry::Register<LLLoadingIndicator> loading_indicator("loading_indicator");
-		LLDefaultChildRegistry::Register<LLLineEditor> line_editor("line_editor");
-		LLDefaultChildRegistry::Register<LLMenuItemSeparatorGL> menu_item_separator("menu_item_separator");
-		LLDefaultChildRegistry::Register<LLMenuItemCallGL> menu_item_call_gl("menu_item_call");
-		LLDefaultChildRegistry::Register<LLMenuItemCheckGL> menu_item_check_gl("menu_item_check");
-		LLDefaultChildRegistry::Register<LLMenuGL> menu("menu");
-		LLDefaultChildRegistry::Register<LLMenuBarGL> menu_bar("menu_bar");
-		LLDefaultChildRegistry::Register<LLContextMenu> context_menu("context_menu");
-		LLDefaultChildRegistry::Register<LLMultiSlider> multi_slider_bar("multi_slider_bar");
-		LLDefaultChildRegistry::Register<LLMultiSliderCtrl> multi_slider("multi_slider");
-		LLDefaultChildRegistry::Register<LLPanel> panel("panel", &LLPanel::fromXML);
-		LLDefaultChildRegistry::Register<LLLayoutStack> layout_stack("layout_stack");
-		LLDefaultChildRegistry::Register<LLProgressBar> progress_bar("progress_bar");
-		LLDefaultChildRegistry::Register<LLRadioGroup> radio_group("radio_group");
-		LLDefaultChildRegistry::Register<LLSearchEditor> search_editor("search_editor");
-		LLDefaultChildRegistry::Register<LLScrollContainer> scroll_container("scroll_container");
-		LLDefaultChildRegistry::Register<LLScrollingPanelList> scrolling_panel_list("scrolling_panel_list");
-		LLDefaultChildRegistry::Register<LLScrollListCtrl> scroll_list("scroll_list");
-		LLDefaultChildRegistry::Register<LLSlider> slider_bar("slider_bar");
-		LLDefaultChildRegistry::Register<LLSliderCtrl> slider("slider");
-		LLDefaultChildRegistry::Register<LLSpinCtrl> spinner("spinner");
-		LLDefaultChildRegistry::Register<LLStatBar> stat_bar("stat_bar");
-		//LLDefaultChildRegistry::Register<LLPlaceHolderPanel> placeholder("placeholder");
-		LLDefaultChildRegistry::Register<LLTabContainer> tab_container("tab_container");
-		LLDefaultChildRegistry::Register<LLTextBox> text("text");
-		LLDefaultChildRegistry::Register<LLTimeCtrl> time("time");
-		LLDefaultChildRegistry::Register<LLTextEditor> simple_text_editor("simple_text_editor");
-		LLDefaultChildRegistry::Register<LLUICtrl> ui_ctrl("ui_ctrl");
-		LLDefaultChildRegistry::Register<LLStatView> stat_view("stat_view");
-		//LLDefaultChildRegistry::Register<LLUICtrlLocate> locate("locate");
-		//LLDefaultChildRegistry::Register<LLUICtrlLocate> pad("pad");
-		LLDefaultChildRegistry::Register<LLViewBorder> view_border("view_border");
-	}
+    // Only need to register if the Windows linker has optimized away the
+    // references to the object files.
+    if (register_widgets)
+    {
+        LLDefaultChildRegistry::Register<LLButton> button("button");
+        LLDefaultChildRegistry::Register<LLMenuButton> menu_button("menu_button");
+        LLDefaultChildRegistry::Register<LLCheckBoxCtrl> check_box("check_box");
+        LLDefaultChildRegistry::Register<LLComboBox> combo_box("combo_box");
+        LLDefaultChildRegistry::Register<LLFilterEditor> filter_editor("filter_editor");
+        LLDefaultChildRegistry::Register<LLFlyoutButton> flyout_button("flyout_button");
+        LLDefaultChildRegistry::Register<LLContainerView> container_view("container_view");
+        LLDefaultChildRegistry::Register<LLIconCtrl> icon("icon");
+        LLDefaultChildRegistry::Register<LLLoadingIndicator> loading_indicator("loading_indicator");
+        LLDefaultChildRegistry::Register<LLLineEditor> line_editor("line_editor");
+        LLDefaultChildRegistry::Register<LLMenuItemSeparatorGL> menu_item_separator("menu_item_separator");
+        LLDefaultChildRegistry::Register<LLMenuItemCallGL> menu_item_call_gl("menu_item_call");
+        LLDefaultChildRegistry::Register<LLMenuItemCheckGL> menu_item_check_gl("menu_item_check");
+        LLDefaultChildRegistry::Register<LLMenuGL> menu("menu");
+        LLDefaultChildRegistry::Register<LLMenuBarGL> menu_bar("menu_bar");
+        LLDefaultChildRegistry::Register<LLContextMenu> context_menu("context_menu");
+        LLDefaultChildRegistry::Register<LLMultiSlider> multi_slider_bar("multi_slider_bar");
+        LLDefaultChildRegistry::Register<LLMultiSliderCtrl> multi_slider("multi_slider");
+        LLDefaultChildRegistry::Register<LLPanel> panel("panel", &LLPanel::fromXML);
+        LLDefaultChildRegistry::Register<LLLayoutStack> layout_stack("layout_stack");
+        LLDefaultChildRegistry::Register<LLProgressBar> progress_bar("progress_bar");
+        LLDefaultChildRegistry::Register<LLRadioGroup> radio_group("radio_group");
+        LLDefaultChildRegistry::Register<LLSearchEditor> search_editor("search_editor");
+        LLDefaultChildRegistry::Register<LLScrollContainer> scroll_container("scroll_container");
+        LLDefaultChildRegistry::Register<LLScrollingPanelList> scrolling_panel_list("scrolling_panel_list");
+        LLDefaultChildRegistry::Register<LLScrollListCtrl> scroll_list("scroll_list");
+        LLDefaultChildRegistry::Register<LLSlider> slider_bar("slider_bar");
+        LLDefaultChildRegistry::Register<LLSliderCtrl> slider("slider");
+        LLDefaultChildRegistry::Register<LLSpinCtrl> spinner("spinner");
+        LLDefaultChildRegistry::Register<LLStatBar> stat_bar("stat_bar");
+        //LLDefaultChildRegistry::Register<LLPlaceHolderPanel> placeholder("placeholder");
+        LLDefaultChildRegistry::Register<LLTabContainer> tab_container("tab_container");
+        LLDefaultChildRegistry::Register<LLTextBox> text("text");
+        LLDefaultChildRegistry::Register<LLTimeCtrl> time("time");
+        LLDefaultChildRegistry::Register<LLTextEditor> simple_text_editor("simple_text_editor");
+        LLDefaultChildRegistry::Register<LLUICtrl> ui_ctrl("ui_ctrl");
+        LLDefaultChildRegistry::Register<LLStatView> stat_view("stat_view");
+        //LLDefaultChildRegistry::Register<LLUICtrlLocate> locate("locate");
+        //LLDefaultChildRegistry::Register<LLUICtrlLocate> pad("pad");
+        LLDefaultChildRegistry::Register<LLViewBorder> view_border("view_border");
+    }
 
-	// *HACK: Usually this is registered as a viewer text editor
-	LLDefaultChildRegistry::Register<LLTextEditor> text_editor("text_editor");
+    // *HACK: Usually this is registered as a viewer text editor
+    LLDefaultChildRegistry::Register<LLTextEditor> text_editor("text_editor");
 }