Ansariel 2aceea66ff Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/newview/llfloateropenobject.cpp # indra/newview/llfloateropenobject.h # indra/newview/llmaterialmgr.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llmeshrepository.h # indra/newview/skins/default/xui/en/floater_openobject.xml		2022-10-01 13:10:39 +02:00
..
cmake	Python cmake hack for GHA (you will need python >3.9 now)	2022-09-17 22:28:05 +01:00
copy_win_scripts	…
doxygen	…
integration_tests	…
lib/python/indra	…
linux_crash_logger	…
llappearance	…
llaudio	…
llcharacter	…
llcommon	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-10-01 13:10:39 +02:00
llcorehttp	…
llcrashlogger	…
llfilesystem	…
llimage	…
llimagej2coj	…
llinventory	…
llkdu	…
llmath	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-10-01 13:10:39 +02:00
llmeshoptimizer	…
llmessage	…
llplugin	…
llprimitive	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-10-01 13:10:39 +02:00
llrender	…
llui	Merge branch 'master' of https://bitbucket.org/lindenlab/viewer	2022-09-15 21:14:13 +02:00
llwindow	Linux/SDL2 - FIRE-32214 - Add checkbox to Preferences/General to enable or disable IME text input, so regular keyboard input will not be affected	2022-09-26 02:02:12 +02:00
llxml	…
mac_crash_logger	…
media_plugins	Merge branch 'master' of https://bitbucket.org/lindenlab/viewer	2022-09-15 21:14:13 +02:00
newview	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-10-01 13:10:39 +02:00
test	…
tools	…
viewer_components	…
win_crash_logger	…
CMakeLists.txt	…
Version	…
edit-me-to-trigger-new-build.txt	…
fix-incredibuild.py	…