Andrey Kleshchev afe91b7eb6 Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X ... # Conflicts: # indra/newview/VIEWER_VERSION.txt		2024-01-08 21:33:06 +02:00
..
cmake	Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge	2023-11-29 10:45:43 +02:00
copy_win_scripts	…
doxygen	…
integration_tests	…
lib/python/indra	…
linux_crash_logger	…
llappearance	SL-17597 AV height in Shape dialog IS WRONG	2023-12-12 08:24:03 +01:00
llaudio	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-10-25 16:12:13 -07:00
llcharacter	SL-20442 Add an 'Until shortcut key released' option to gestures so we can do properly user-mappable keys	2023-11-24 17:41:23 +01:00
llcommon	SL-17896 Don't crash silently if files are missing or out of memory	2024-01-04 21:13:06 +02:00
llcorehttp	SL-17896 Don't crash silently if files are missing or out of memory	2024-01-04 21:13:06 +02:00
llcrashlogger	…
llfilesystem	…
llimage	SL-17896 Don't crash silently if files are missing or out of memory	2024-01-04 21:13:06 +02:00
llimagej2coj	…
llinventory	SL-19968 disabled pump_idle_network for now due to it causing several failures during login	2023-11-06 14:30:33 -08:00
llkdu	…
llmath	…
llmeshoptimizer	…
llmessage	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-10-25 16:12:13 -07:00
llplugin	…
llprimitive	Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X	2024-01-08 21:33:06 +02:00
llrender	Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X	2024-01-08 21:33:06 +02:00
llui	SL-17896 Don't crash silently if files are missing or out of memory	2024-01-04 21:13:06 +02:00
llwindow	Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X	2024-01-08 21:33:06 +02:00
llxml	…
media_plugins	…
newview	Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X	2024-01-08 21:33:06 +02:00
test	Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge	2023-11-29 10:45:43 +02:00
tools/vstool	…
viewer_components	…
win_crash_logger	…
CMakeLists.txt	…
edit-me-to-trigger-new-build.txt	…
fix-incredibuild.py	…