Go to file
Ansariel 998dc17eff Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llfloatermarketplacelistings.cpp
#	indra/newview/llfloatermarketplacelistings.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/skins/default/colors.xml
#	indra/newview/skins/default/xui/en/floater_snapshot.xml
2023-02-14 17:32:34 +01:00
.github update to control build channel from branch 2023-01-20 18:47:10 +00:00
doc Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 2023-02-14 17:32:34 +01:00
etc Merge axon 2017-09-20 01:09:14 +02:00
fsutils Add Beta channel build support 2023-01-20 22:49:07 +00:00
indra Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 2023-02-14 17:32:34 +01:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 01:41:17 +02:00
.clang-format DRTVWR-497 tweak clang-format rules for argument packing 2020-08-24 13:52:57 -06:00
.gitattributes More line ending normalization madness 2020-01-16 09:35:33 +01:00
.gitignore Minor gitignore cleanup 2023-01-23 10:36:00 +00:00
.pre-commit-config.yaml SL-15741: Add pre-commit configuration 2022-01-24 18:47:10 +02:00
BuildParams Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt Flip dates to 2023 2023-01-02 19:19:28 +01:00
LICENSE Renamed LICENSE.txt to follow naming scheme of other repos 2022-11-18 17:10:03 -05:00
README_BUILD_FIRESTORM_LINUX.txt Add example for using multithreaded xz compression to linux build instructions 2022-02-15 17:10:52 +01:00
README_BUILD_FIRESTORM_MACOSX.txt tip to default branch. 2014-12-12 09:36:00 +01:00
README_BUILD_FIRESTORM_WINDOWS.txt Update configure script and Windows readme file for VS2017 tools update 2020-07-24 00:20:08 +02:00
autobuild.xml Linux: Update openjpeg library (now built on focal). Previous version built on Bionic (which is imminent of being EOL) introduced some compatibility issues on systems with glibc 2.31 and beyond and resulted in linker failures. 2023-02-06 11:36:24 +11:00
build.sh Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
build_target.sh Add simple script to allow parallel build of OS/SL 2020-10-10 01:39:14 +01:00
requirements.txt Extend GHA for Release builds (with Mac Codesigning) 2022-12-17 16:00:04 +00:00