livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Andrey Kleshchev 7c1cd47772 Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
#	indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
 		2021-12-15 21:16:47 +02:00
..
cmake Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360 2021-11-16 01:24:03 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
llaudio Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
llcharacter Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
llcommon Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
llcorehttp SL-15902 Cleanup gSecAPIHandler 2021-09-03 22:21:29 +03:00
llcrashlogger
…
llfilesystem Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
llimage Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
llimagej2coj
…
llinventory Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
llkdu
…
llmath SL-16413 Handle out of memory llface allocations 2021-11-25 00:00:29 +02:00
llmessage Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
llplugin Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360 2021-11-16 01:24:03 +02:00
llprimitive Merge branch 'master' into DRTVWR-527-maint 2021-11-16 00:54:53 +02:00
llrender
…
llui Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
llwindow Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
llxml
…
mac_crash_logger Merge branch 'master' into DRTVWR-520-apple-notarization 2021-08-12 23:13:12 +03:00
media_plugins Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
newview Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
test Revert "Merge branch 'c++17' into DRTVWR-522-maint" 2021-09-28 19:22:18 +03:00
tools/vstool
…
viewer_components SL-16450 Don not crash viewer in case of invalid data type 2021-12-08 21:51:32 +02:00
win_crash_logger Merge branch 'master' into DRTVWR-520-apple-notarization 2021-08-12 23:13:12 +03:00
CMakeLists.txt Merge with master after latest Viewer release 2021-10-13 16:54:08 -07:00
edit-me-to-trigger-new-build.txt DRTVWR-545 New line for the coding policy check 2021-09-28 19:44:52 +03:00
fix-incredibuild.py
…