Ansariel 1cca913ba7 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/CMakeLists.txt # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/llmodelloader.cpp # indra/llrender/llgl.h # indra/llrender/llrender.h # indra/llui/llurlentry.cpp # indra/llui/llurlentry.h # indra/newview/llviewerdisplay.cpp # indra/newview/llvoavatar.cpp		2024-09-13 18:54:12 +02:00
..
cmake	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
copy_win_scripts	…
doxygen	…
integration_tests	…
lib/python/indra	…
linux_crash_logger	…
llappearance	Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer	2024-08-27 18:33:30 +02:00
llaudio	…
llcharacter	Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer	2024-08-27 18:33:30 +02:00
llcommon	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llcorehttp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-09 19:48:04 +02:00
llcrashlogger	…
llfilesystem	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-04 00:33:40 +02:00
llimage	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-09 19:48:04 +02:00
llimagej2coj	…
llinventory	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llkdu	…
llmath	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llmeshoptimizer	…
llmessage	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llplugin	…
llprimitive	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llrender	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llui	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llwebrtc	…
llwindow	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llxml	…
mac_crash_logger	…
media_plugins	…
newview	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
test	…
tools	…
viewer_components	defensively capture coroutine args by value	2024-08-26 15:01:04 -07:00
win_crash_logger	…
CMakeLists.txt	…
Version	…
edit-me-to-trigger-new-build.txt	…