phoenix-firestorm/indra
Ansariel ccb1dfa072 Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2023-05-02 20:11:20 +02:00
..
cmake Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-04-22 18:51:56 +02:00
copy_win_scripts
doxygen
integration_tests Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 2023-03-21 11:32:38 +01:00
lib/python/indra
linux_crash_logger Linux: Restore crashreporting (hopefully) 2023-03-31 00:05:29 +11:00
llappearance Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2023-03-21 10:57:56 +01:00
llaudio
llcharacter Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 2023-04-21 19:43:30 +02:00
llcommon Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-02 18:22:32 +02:00
llcorehttp Merge branch 'main' of https://github.com/secondlife/viewer 2023-03-30 02:51:16 +02:00
llcrashlogger
llfilesystem const ref please! 2023-04-04 13:16:14 +02:00
llimage Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2023-03-21 10:57:56 +01:00
llimagej2coj Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2023-03-21 10:57:56 +01:00
llinventory BUG-233797/BUG-233798 -ve underwater fog density causes blackout 2023-04-30 11:38:45 +01:00
llkdu
llmath Linux: Quench gcc warnings in boost includes. 2023-03-26 15:49:22 +02:00
llmeshoptimizer
llmessage Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 2023-03-21 11:32:38 +01:00
llplugin Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2023-03-21 10:57:56 +01:00
llprimitive Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-30 13:06:36 +02:00
llrender Remove stray comment marker, oops! 2023-04-03 05:30:49 +02:00
llui Merge branch 'main' into DRTVWR-580-maint-T 2023-05-02 17:39:29 +03:00
llwindow Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 2023-05-02 20:11:20 +02:00
llxml
mac_crash_logger
media_plugins Linux: take out glib dependency from volume catcher, restore cef functionality, some cmake cleanup by PorkChop 2023-04-04 05:38:46 +02:00
newview Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 2023-05-02 20:11:20 +02:00
test
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt
fix-incredibuild.py