Maxim Nikolenko 198cd4df09 Merge branch 'main' into DRTVWR-567 ... # Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml		2023-03-30 14:09:50 +03:00
..
cmake	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
copy_win_scripts	…
doxygen	…
integration_tests	Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R	2023-03-20 01:23:16 +02:00
lib/python/indra	…
linux_crash_logger	…
llappearance	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llaudio	…
llcharacter	Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R	2023-03-20 01:23:16 +02:00
llcommon	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llcorehttp	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llcrashlogger	…
llfilesystem	Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R	2023-03-20 01:23:16 +02:00
llimage	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llimagej2coj	Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R	2023-03-20 01:23:16 +02:00
llinventory	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llkdu	…
llmath	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llmeshoptimizer	…
llmessage	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llplugin	Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R	2023-03-20 01:23:16 +02:00
llprimitive	Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R	2023-03-20 01:23:16 +02:00
llrender	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llui	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
llwindow	Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R	2023-03-20 01:23:16 +02:00
llxml	…
media_plugins	…
newview	Merge branch 'main' into DRTVWR-567	2023-03-30 14:09:50 +03:00
test	…
tools/vstool	…
viewer_components	…
win_crash_logger	…
CMakeLists.txt	…
edit-me-to-trigger-new-build.txt	…
fix-incredibuild.py	…