Go to file
Ansariel aa7c8eeaef Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llprofiler.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
2023-11-07 11:56:19 +01:00
.github Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-07 10:23:48 +01:00
doc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-04 11:38:21 +02:00
etc Merge axon 2017-09-20 01:09:14 +02:00
fsutils GHA updates to align with PBR. 2023-08-30 09:51:42 +01:00
indra Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-11-07 11:56:19 +01:00
scripts SL-20473 Add GenericStreamingMessage and dummy handler to suppress packet loss and log spam noise when visiting GLTF enabled regions. 2023-10-28 13:34:12 +02:00
.clang-format DRTVWR-497 tweak clang-format rules for argument packing 2020-08-24 13:52:57 -06:00
.gitattributes Undo Git breaking NSIS files - how can you screw it up like that actually??? 2023-08-28 11:59:04 +02:00
.gitignore Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-10-25 16:12:13 -07:00
.pre-commit-config.yaml SL-19541: Add basic coding standards check 2023-04-04 12:47:19 -07: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 Windows build instructions 2023-10-27 16:24:05 +02:00
autobuild.xml Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-07 10:23:48 +01:00
build.sh Merge branch 'main' of https://github.com/secondlife/viewer 2023-10-26 15:49:12 +02:00
build_target.sh Add simple script to allow parallel build of OS/SL 2020-10-10 01:39:14 +01:00
buildscripts_support_functions SL-18837: Get buildscripts_support_functions from sling-buildscripts 2023-06-28 16:58:32 -04:00
requirements.txt Fix the operator in requirements 2023-08-30 09:26:17 +01:00