Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/APR.cmake
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/viewer_manifest.py
# indra/test/namedtempfile.h