Ansariel 684bc1d1ea Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/00-Common.cmake # indra/llcommon/llsys.cpp # indra/llwindow/llwindow.cpp # indra/llwindow/llwindow.h # indra/llwindow/llwindowmacosx.cpp # indra/llwindow/llwindowmacosx.h # indra/llwindow/llwindowwin32.cpp # indra/llwindow/llwindowwin32.h # indra/newview/app_settings/logcontrol.xml # indra/newview/llappviewerwin32.cpp # indra/newview/llpanelpeople.h # indra/newview/llspeakers.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvocache.cpp # indra/newview/llvoicechannel.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoiceclient.h # indra/newview/llvoicevivox.cpp # indra/newview/skins/default/xui/en/panel_preferences_sound.xml # indra/newview/viewer_manifest.py # scripts/messages/message_template.msg.sha1		2024-06-21 19:46:51 +02:00
..
CMakeLists.txt	Merge remote-tracking branch 'LL/project/webrtc-voice'	2024-05-21 00:42:55 +02:00
llwebrtc.cpp	Fix whitespace for pre-commit hooks	2024-06-18 11:57:11 -07:00
llwebrtc.h	Fix whitespace for pre-commit hooks	2024-06-18 11:57:11 -07:00
llwebrtc_impl.h	Fix whitespace for pre-commit hooks	2024-06-18 11:57:11 -07:00