Ansariel
830eeaa6ff
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llface.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewertexturelist.cpp
2024-08-21 00:46:46 +02:00
Andrey Lihatskiy
4149fba7d5
Update colladadom to 2.3.0-r8
...
after updating boost
2024-08-20 20:55:38 +03:00
Andrey Lihatskiy
355c4a7109
Update boost to v1.86
2024-08-20 20:30:12 +03:00
Andrey Lihatskiy
5c936e26c0
Update freetype to v2.13.3
2024-08-20 20:05:29 +03:00
Andrey Lihatskiy
dda514ceb8
Update tinyexr to v1.0.9
2024-08-20 20:03:50 +03:00
Brad Linden
68f712615f
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicewebrtc.cpp
2024-08-20 09:44:14 -07:00
Ansariel
571155c561
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.cpp
# indra/llfilesystem/lldiskcache.h
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llaccordionctrl.cpp
# indra/llui/llaccordionctrl.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/llfloatertools.cpp
# indra/newview/llfloatertools.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llpreviewnotecard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewtexture.cpp
# indra/newview/llscreenchannel.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
2024-08-19 18:55:52 +02:00
Roxie Linden
2dae5a880d
update webrtc again.
2024-08-18 23:12:03 -07:00
Roxie Linden
28fdd6e786
Update webrtc to fix loss of stereo in bluetooth issue.
...
When transitioning from mic-on hands-free mode to mic off,
it's expected that the audio stream would return to stereo.
Inproper logic in the mac device code in webrtc was preventing
that.
2024-08-18 00:30:16 -07:00
Roxie Linden
63d17b395b
Microphone was being prematurely enabled on login for a short period.
...
The microphone issue was causing a short moment of sound, and was
causing bluetooth headsets to switch to hands-free/one channel mode
which is disruptive.
Also, update webrtc to deal with issue where airpods were garbled
after coming out of hands-free mode.
2024-08-17 20:11:46 -07:00
Brad Linden
5f26ba8014
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
...
# Conflicts:
# indra/newview/llpanelpeople.cpp
2024-08-15 09:41:54 -07:00
Rye Mutt
75c422613f
Update nvapi to R560 ( #2302 )
2024-08-15 05:49:51 +03:00
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
Roxie Linden
4e6143f0ef
don't fatal error on AudioDeviceStop
2024-08-13 19:41:53 -07:00
Rye Mutt
183b097072
Update tracy integration to 0.11 and rework client library to be configurable at build time
...
Also copy tracy profiler client next to windows binary when enabled
2024-08-13 17:27:30 -04:00
Roxie Linden
47fc1d2f2a
[WebRTC] allow quad channel microphones/inputs
...
Issue #257 - bugsplat crash.
In the debug version of WebRTC, it makes an explicit check that the number
of channels for an input device is between 1 and 2. The release version allows
more, and should downmix if 1 channel is asked for.
This fix bumps up the max channels allowed to 8.
2024-08-12 11:32:19 -07:00
Rye Mutt
f982463488
Update zlib-ng libxml2 libpng freetype minizip-ng boost collada-dom tinygltf packages ( #2250 )
...
Rebuild expat, apr, meshoptimizer, ogg_vorbis, libjpeg-turbo for symbol fixes
2024-08-12 07:30:42 +03:00
Ansariel
dde5e9a8c1
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llvoavatar.cpp
2024-08-10 14:38:13 +02:00
Andrey Lihatskiy
cf160e3023
Update dullahan to v1.14.0-r3 ( #2243 )
2024-08-09 20:12:57 +03:00
Ansariel
3be6763aa0
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/APR.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llface.h
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerobjectlist.h
# indra/newview/llvoavatar.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2024-08-08 21:34:26 +02:00
Ansariel
46e5e87315
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
2024-08-08 18:55:33 +02:00
Rye Mutt
810d11c625
Update xxhash to 0.8.2 ( #2217 )
2024-08-08 18:57:35 +03:00
Rye Mutt
12cb787f31
Update libexpat to 2.6.2 and libapr 1.7.4 ( #2214 )
2024-08-08 18:57:26 +03:00
Ansariel
02bc059951
Fix llphysicsextensions_tpv package hashes
2024-08-06 15:03:01 +02:00
Beq
84681c3cfd
Update tpv havok
2024-08-06 10:40:06 +01:00
Ansariel
80f9aaa46e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Audio.cmake
# indra/llui/llconsole.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llhudnametag.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llscripteditor.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerchat.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerparceloverlay.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvosurfacepatch.cpp
2024-08-05 20:10:02 +02:00
Rye Mutt
4a702182da
Update ogg_vorbis to 1.3.5-1.3.7 ( #2186 )
2024-08-05 03:03:01 +03:00
Ansariel
ad60f1cbee
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llworldmap.h
# indra/newview/skins/default/xui/en/floater_world_map.xml
2024-08-03 00:47:13 +02:00
Zi Ree
003aeab948
Linux: put pcre back to please glib
2024-08-02 19:57:59 +02:00
Andrey Lihatskiy
73f89548cb
Update vlc to version 3.0.21 ( #2181 )
2024-08-02 20:03:42 +03:00
Ansariel
9acc68646c
Set the correct version number
2024-08-02 15:41:54 +02:00
Ansariel
a944a7b54a
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llui/llemojihelper.cpp
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2024-08-02 15:39:34 +02:00
Rye Mutt
db8adab2a3
Update viewer-font and emojibase packages for Twemoji with Unicode 15 support ( #2176 )
2024-08-02 13:34:33 +03:00
Rye Mutt
f08b3f2046
Update to libhunspell 1.7.2-r1 ( #2175 )
2024-08-02 13:31:11 +03:00
Rye Mutt
05fd13f896
Remove dead pcre library dependency ( #2177 )
2024-08-02 13:29:28 +03:00
Rye Mutt
68ad61f6f5
Update from jpeglib to libjpeg-turbo 3.0.3 ( #2161 , #2173 )
2024-08-02 13:25:39 +03:00
Ansariel
d3ba6ca08c
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
2024-08-02 12:04:58 +02:00
Ansariel
b0a053d447
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
2024-08-02 12:00:46 +02:00
Ansariel
fa4ad236fc
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
2024-08-02 11:59:06 +02:00
Brad Linden
0ff2bd1a40
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
2024-08-01 15:42:22 -07:00
Brad Linden
002be0f243
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
2024-08-01 15:40:41 -07:00
Roxie Linden
b9c222dfae
Implement a Logging Sink for WebRTC
...
WebRTC logs now pass out of the webrtc library into a logging sink,
which converts them into SecondLife.log compatable logging calls.
This includes fatal errors and asserts, which are now logged into
SecondLife.log, and should be available in the crash logger.
2024-07-31 21:23:30 -06:00
Roxie Linden
2582e4a47a
Use new webrtc lib with crash-on-fatal support
2024-07-30 16:53:46 -06:00
Ansariel
02680c6a8f
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llxml/llxmltree.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroup.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/viewer_manifest.py
2024-07-30 12:32:41 +02:00
Rye Mutt
3e322df4fb
Replace liburiparser with boost::url
2024-07-29 13:33:12 +03:00
Rye Mutt
c7c7342ed3
Update boost to 1.85 and fix deprecation warnings
2024-07-29 08:20:32 +03:00
Ansariel
e17c906698
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llcontrolavatar.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
2024-07-22 20:58:53 +02:00
Andrey Lihatskiy
75fb5c0d5e
Update llca to 202407221423.0 ( #2084 )
2024-07-22 17:41:51 +03:00
Ansariel
cf5bc75d44
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
...
# Conflicts:
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/rlvinventory.cpp
2024-07-18 21:53:13 +02:00
Ansariel
f04ed0e5e4
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llspeakers.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
2024-07-18 20:27:40 +02:00