Andrey Kleshchev 3f31901640 Merge master (DRTVWR-515) into DRTVWR-516-maint ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp		2021-04-29 21:00:25 +03:00
..
cppfeatures_test.cpp	…
gpus_results.txt	…
gpus_seen.txt	…
gpus_unmatched.txt	…
llagentaccess_test.cpp	…
lldateutil_test.cpp	…
lldir_stub.cpp	…
llglslshader_stub.cpp	…
llhttpretrypolicy_test.cpp	…
lllogininstance_test.cpp	…
llmediadataclient_test.cpp	…
llpipeline_stub.cpp	…
llremoteparcelrequest_test.cpp	…
llsecapi_test.cpp	…
llsechandler_basic_test.cpp	…
llsky_stub.cpp	…
llslurl_test.cpp	…
lltextureinfo_test.cpp	…
lltextureinfodetails_test.cpp	…
lltexturestatsuploader_test.cpp	…
llversioninfo_test.cpp	…
llviewerassetstats_test.cpp	…
llviewerhelputil_test.cpp	…
llviewernetwork_test.cpp	…
llviewershadermgr_stub.cpp	…
llviewertexture_stub.cpp	…
llwlanimator_stub.cpp	…
llwldaycycle_stub.cpp	…
llwlparammanager_test.cpp	…
llwlparamset_stub.cpp	…
llworldmap_test.cpp	…
llworldmipmap_test.cpp	…
llxmlrpclistener_test.cpp	…
test_llxmlrpc_peer.py	…