Fork of https://github.com/FirestormViewer/phoenix-firestorm

Ansariel 24db83c554 Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/app_settings/settings.xml # indra/newview/featuretable_mac.txt # indra/newview/llfloaterpreference.cpp # indra/newview/llperfstats.cpp # indra/newview/llperfstats.h # indra/newview/llstartup.cpp # indra/newview/llvoavatar.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/en/floater_performance.xml # indra/newview/skins/default/xui/en/panel_performance_complexity.xml # indra/newview/skins/default/xui/en/panel_performance_huds.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml # indra/newview/skins/default/xui/en/panel_presets_pulldown.xml		2023-02-03 17:15:04 +01:00
.github	update to control build channel from branch	2023-01-20 18:47:10 +00:00
doc	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-02-03 15:34:47 +01:00
etc	…
fsutils	Add Beta channel build support	2023-01-20 22:49:07 +00:00
indra	Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer	2023-02-03 17:15:04 +01:00
scripts	…
.clang-format	…
.gitattributes	…
.gitignore	Minor gitignore cleanup	2023-01-23 10:36:00 +00:00
.pre-commit-config.yaml	…
BuildParams	…
FIRESTORM-SOURCE_LICENSE_HEADER.txt	…
LICENSE	…
README_BUILD_FIRESTORM_LINUX.txt	…
README_BUILD_FIRESTORM_MACOSX.txt	…
README_BUILD_FIRESTORM_WINDOWS.txt	…
autobuild.xml	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-02-03 15:34:47 +01:00
build.sh	…
build_target.sh	…
requirements.txt	…