Merge branch 'main' into main

doc/contributions.txt

indra/cmake/Copy3rdPartyLibs.cmake

indra/edit-me-to-trigger-new-build.txt

indra/integration_tests/llui_libtest/CMakeLists.txt

indra/llcommon/tests/llprocess_test.cpp

indra/llui/llscrolllistcell.cpp

indra/llui/llscrolllistcell.h

indra/llwindow/llwindow.cpp

indra/llwindow/llwindow.h

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowwin32.cpp

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/commands.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/toolbars.xml

indra/newview/featuretable.txt

indra/newview/featuretable_mac.txt

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp