phoenix-firestorm/indra
Ansariel 5e75273b49 Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/llagent.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvoicevivox.h
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
2024-03-19 17:09:42 +01:00
..
cmake Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer 2024-03-19 17:09:42 +01:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger Linux: Fix build after recent merge 2024-03-03 00:10:32 +11:00
llappearance
llaudio
llcharacter
llcommon
llcorehttp This reverts commit 3be882c1c6 - Not compatible with LL's version of curl (too old). 2024-03-03 00:12:16 +11:00
llcrashlogger
llfilesystem
llimage
llimagej2coj
llinventory
llkdu
llmath Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer 2024-03-19 17:09:42 +01:00
llmeshoptimizer
llmessage
llplugin
llprimitive
llrender Get rid of static method declarations in header since they are only used in the cpp translation unit 2024-03-10 16:25:20 +01:00
llui FIRE-33773 - avoid OOB access under certain conditions 2024-03-16 19:57:22 +00:00
llwebrtc Refactor device selection logic 2024-03-14 20:04:39 -07:00
llwindow
llxml
mac_crash_logger
media_plugins
newview Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer 2024-03-19 17:09:42 +01:00
test
tools
viewer_components
win_crash_logger
CMakeLists.txt Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer 2024-03-19 17:09:42 +01:00
Version
edit-me-to-trigger-new-build.txt
fix-incredibuild.py