phoenix-firestorm/indra
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500
# Conflicts:
#	indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
..
cmake
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance
llaudio
llcharacter
llcommon Merge branch 'master' into DRTVWR-500 2020-04-20 21:23:34 +03:00
llcorehttp
llcrashlogger
llimage
llimagej2coj
llinventory SL-12911 Add Debug setting EnvironmentPersistAcrossLogin 2020-03-27 00:24:08 +02:00
llkdu
llmath Merge branch 'master' into DRTVWR-500 2020-04-20 21:23:34 +03:00
llmessage Merge branch 'master' into DRTVWR-500 2020-04-20 21:23:34 +03:00
llplugin
llprimitive SL-12902 Better fix for light color values in color swatch not matching light color values inworld. 2020-03-27 17:32:01 -05:00
llrender Merge branch 'master' into DRTVWR-500 2020-04-20 21:23:34 +03:00
llui Merge branch 'master' into DRTVWR-500 2020-04-20 21:23:34 +03:00
llvfs
llwindow
llxml
mac_crash_logger
media_plugins
newview Merge branch 'master' into DRTVWR-500 2020-04-20 21:23:34 +03:00
test
tools/vstool
viewer_components
win_crash_logger
CMakeLists.txt
edit-me-to-trigger-new-build.txt
fix-incredibuild.py