Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py		2022-03-01 13:41:42 +02:00
..
CMakeLists.txt	DRTVWR-546 merge in master v6.5.1	2021-11-16 11:44:55 -07:00
mac_volume_catcher.cpp	…
mac_volume_catcher_null.cpp	Add NULL macOs implementation for 'MAINT-6950 Shared media a great distance away (different region even) sometimes plays at maximum volume when entering a region or moving camera slightly.' - until we can understand how to make real mac_volume_catcher work	2017-04-28 13:48:36 -07:00
media_plugin_cef.cpp	Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK	2022-01-10 23:51:52 +02:00
volume_catcher.h	…
windows_volume_catcher.cpp	DRTVWR-494: Fix Windows macro collisions in windows_volume_catcher	2020-03-25 15:28:17 -04:00