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
..
CMakeLists.txt	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
llaudiodecodemgr.cpp	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
llaudiodecodemgr.h	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
llaudioengine.cpp	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
llaudioengine.h	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
llaudioengine_fmodstudio.cpp	SL-14992 Replaced LLAPRFile's isExist with LLDirUtil's fileExists in fmodstudio	2021-03-25 20:14:04 +02:00
llaudioengine_fmodstudio.h	SL-11445 Provide 'name' for Pulse Audio	2020-04-10 17:00:22 +03:00
llaudioengine_openal.cpp	SL-13390 Fix Openal Builds	2020-06-05 17:25:51 +03:00
llaudioengine_openal.h	SL-11445 Provide 'name' for Pulse Audio	2020-04-10 17:00:22 +03:00
lllistener.cpp	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
lllistener.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
lllistener_ds3d.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
lllistener_fmodstudio.cpp	SL-11445 Fix fmod studio position and orientation attributes	2020-04-09 16:04:37 +03:00
lllistener_fmodstudio.h	Merged in SL-11445 Upgrade Fmodex to Fmod Studio	2020-01-31 15:05:51 +00:00
lllistener_openal.cpp	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
lllistener_openal.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llstreamingaudio.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llstreamingaudio_fmodstudio.cpp	SL-14992 fmod shutdown crash	2021-11-18 20:37:26 +02:00
llstreamingaudio_fmodstudio.h	SL-14992 fmod shutdown crash	2021-11-18 20:37:26 +02:00
llvorbisencode.cpp	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llvorbisencode.h	SL-10334 Increased allowed sound clip length from 10s to 30s	2019-05-02 02:04:07 +03:00
llwindgen.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00