Andrey Lihatskiy f9866a3543 Merge branch 'main' into DRTVWR-573-maint-R ... # Conflicts: # autobuild.xml # indra/newview/llagent.cpp # indra/newview/llimview.cpp # indra/newview/llimview.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmediasettingsgeneral.cpp # indra/newview/pipeline.cpp		2023-01-12 04:37:42 +02:00
..
cmake	…
copy_win_scripts	…
doxygen	…
integration_tests	…
lib/python/indra	…
linux_crash_logger	…
llappearance	…
llaudio	Merge branch 'master' into DRTVWR-548-maint-N	2022-09-15 20:44:04 +03:00
llcharacter	Merge branch 'master' into DRTVWR-548-maint-N	2022-09-15 20:44:04 +03:00
llcommon	Merge branch 'main' into DRTVWR-573-maint-R	2023-01-12 04:37:42 +02:00
llcorehttp	…
llcrashlogger	…
llfilesystem	Merge branch 'master' into DRTVWR-548-maint-N	2022-09-15 20:44:04 +03:00
llimage	…
llimagej2coj	…
llinventory	…
llkdu	…
llmath	Merge branch 'master' into DRTVWR-565-maint-P	2022-10-20 21:43:54 +03:00
llmeshoptimizer	…
llmessage	Merge branch 'master' into DRTVWR-565-maint-P	2022-10-20 21:43:54 +03:00
llplugin	SL-18801 Crash at LLPluginProcessParent::pollTick()	2022-12-07 19:33:47 +02:00
llprimitive	Merge branch 'master' into DRTVWR-565-maint-P	2022-10-20 21:43:54 +03:00
llrender	Merge branch 'master' into DRTVWR-548-maint-N	2022-09-15 20:44:04 +03:00
llui	Merge branch 'main' into DRTVWR-573-maint-R	2023-01-12 04:37:42 +02:00
llwindow	Merge branch 'main' into DRTVWR-573-maint-R	2023-01-12 04:37:42 +02:00
llxml	…
media_plugins	SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The Viewer part of the fix for this JIRA - pulls in the updated Dullahan that exposes the user_gesture/is_redirect flags and uses them to determine what type of 'nav_type' is exchanged with viewer/plugin	2022-09-14 14:52:31 -07:00
newview	Merge branch 'main' into DRTVWR-573-maint-R	2023-01-12 04:37:42 +02:00
test	…
tools/vstool	…
viewer_components	…
win_crash_logger	…
CMakeLists.txt	…
edit-me-to-trigger-new-build.txt	…
fix-incredibuild.py	…