phoenix-firestorm/indra
Ansariel 2053458181 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorybridge.cpp
#	indra/newview/pipeline.h
#	indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-18 14:55:45 +02:00
..
cmake Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-08-31 18:09:40 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-04 11:38:21 +02:00
llaudio Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-08-31 18:09:40 +02:00
llcharacter
llcommon Memory profiling currently doesn't work - disable it for now 2023-10-15 13:11:49 +02:00
llcorehttp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-04 11:38:21 +02:00
llcrashlogger
llfilesystem
llimage
llimagej2coj
llinventory Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-04 11:38:21 +02:00
llkdu
llmath Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-10-18 14:55:45 +02:00
llmeshoptimizer
llmessage Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-04 11:38:21 +02:00
llplugin
llprimitive Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-10-18 14:55:45 +02:00
llrender Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-04 11:38:21 +02:00
llui Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-10-11 12:58:24 +02:00
llwindow Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-09-20 15:07:19 +02:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-10-18 14:55:45 +02:00
test
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt
fix-incredibuild.py