Ansariel 07228d3a9e Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/CURL.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FreeType.cmake # indra/cmake/LLPrimitive.cmake # indra/cmake/NGHTTP2.cmake # indra/cmake/Tracy.cmake # indra/llappearance/llavatarappearancedefines.cpp # indra/llcommon/llprofiler.cpp # indra/llcommon/llprofiler.h # indra/llfilesystem/lldiskcache.cpp # indra/llfilesystem/lldiskcache.h # indra/llinventory/llinventorytype.cpp # indra/media_plugins/example/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/installers/windows/installer_template.nsi # indra/newview/llappearancemgr.cpp # indra/newview/llappviewer.cpp # indra/newview/llgroupmgr.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatarself.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml # indra/newview/viewer_manifest.py		2024-08-15 00:12:13 +02:00
..
CMakeLists.txt	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-15 00:12:13 +02:00
dummy_volume_catcher.cpp	Linux: disable volume catcher for the time being to allow cef/dullahan to load	2024-08-10 16:50:53 +02:00
linux_volume_catcher.cpp	FIRE-34344 - add safeguard for string to longlong conversion against 0 pointer	2024-08-06 19:38:27 +02:00
linux_volume_catcher_pa_syms.inc	…
linux_volume_catcher_paglib_syms.inc	…
mac_volume_catcher.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
mac_volume_catcher_null.cpp	…
media_plugin_cef.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
volume_catcher.h	…
windows_volume_catcher.cpp	…