5e5a3f4102
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltextbase.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/lleventpoll.cpp
2025-09-22 23:11:55 +02:00
0fb6dc22ff
Fix builds after update of build-variables branch
2025-09-19 15:45:59 +03:00
82e431e090
Merge remote-tracking branch 'origin/release/2025.07' into geenz/2025.07-develop
2025-09-18 15:23:26 -04:00
badeccbebc
NSIS build fix ( #4698 )
2025-09-18 21:37:12 +03:00
5fdef7863e
Merge branch 'release/2025.07' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/skins/default/xui/en/menu_inventory.xml
2025-09-16 18:33:02 +02:00
a6d4c1d394
[WebRTC] Rework device handling sequence so that we can handle unplugging/re-plugging devices ( #4593 )
...
* [WebRTC] Rework device handling sequence so that we can handle unplugging/re-plugging devices
The device handling was not processing device updates in the proper sequence as
things like AEC use both input and output devices. Devices like headsets are both
so unplugging them resulted in various mute conditions and sometimes even a crash.
Now, we update both capture and render devices at once in the proper sequence.
Test Guidance:
* Bring two users in the same place in webrtc regions.
* The 'listening' one should have a headset or something set oas 'Default'
* Press 'talk' on one, and verify the other can hear.
* Unplug the headset from the listening one.
* Validate that audio changes from the headset to the speakers.
* Plug the headset back in.
* Validate that audio changes from speakers to headset.
* Do the same type of test with the headset viewer talking.
* The microphone used should switch from the headset to the computer (it should have one)
Do other various device tests, such as setting devices explicitly, messing with the device selector, etc.
* Fix race condition when multiple change device requests might come in at once
* Update to m137
The primary feature of this commit is to update libwebrtc from m114
to m137. This is needed to make webrtc buildable, as m114 is not buildable
by the current toolset.
m137 had some changes to the API, which required renaming or changing namespace
of some of the calls.
Additionally, this PR moves from a callback mechanism for gathering the energy
levels for tuning to a wrapper AudioDeviceModule, which gives us more control
over the audio stream.
Finally, the new m137-based webrtc has been updated to allow for 192khz audio
streams.
* Properly pass the observer setting into the inner audio device module
* Update to m137 and get rid of some noise
This change updates to m137 from m114, which required a few API changes.
Additionally, this fixes the hiss that happens shortly after someone unmutes: https://github.com/secondlife/server/issues/2094
There was also an issue with a slight amount of repeated after unmuting if there was audio right before unmuting. This is because
the audio processing and buffering still had audio from the previous speaking session. Now, we inject nearly a half second of
silence into the audio buffers/processor after unmuting to flush things.
* Install nsis on windows
* Use the newer digital AGC pipeline
m137 improved the AGC pipeline and the existing analog style is going away
so move to the new digital pipeline.
Also, some tweaking for audio levels so that we don't see inworld bars when tuning,
so one's own bars seem a reasonable size, etc.
* Install NSIS during windows sisgning and package build step
* Try pinning the packaging to windows 2022 to deal with missing nsis
* Adjust gain calculation and audio level calculations for tuning and peer connections
* Update with mac universal webrtc build
* Tuning of voice indicators for both tuning mode and inworld for self.
* Redo device deployment to handle cases where multiple deploy requests pile up
Also, mute when leaving webrtc-enabled regions or parcels,
and unmute when voice comes back.
* pre commit issue
2025-09-12 20:07:51 -04:00
42695904d6
Use XL mac runners due to the unibin build time. ( #4674 )
...
Temporary until we can better parallelize architecture specific builds.
2025-09-12 19:17:58 -04:00
651665235f
Merge branch 'release/2025.07' of https://github.com/secondlife/viewer
2025-09-10 23:39:58 +02:00
dd1113ba2b
Merge branch 'release/2025.07' into project/mac_universal
2025-09-10 13:29:51 -04:00
1754002308
Fix build failing due to missing nsis
...
Temporary switch to windows 2022, latest 2025 doesn't have nsis
2025-09-10 00:29:06 +03:00
b99cf9fb86
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
4b8049e22b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-09-03 19:44:45 +02:00
1f53ef9808
Merge pull request #158 from FirestormViewer/dependabot/github_actions/actions/download-artifact-5
...
Bump actions/download-artifact from 4 to 5
2025-09-01 23:42:20 +02:00
a21813339a
Bump actions/download-artifact from 4 to 5
...
Bumps [actions/download-artifact](https://github.com/actions/download-artifact ) from 4 to 5.
- [Release notes](https://github.com/actions/download-artifact/releases )
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: actions/download-artifact
dependency-version: '5'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2025-09-01 18:29:37 +00:00
1afff91ed2
Bump actions/checkout from 4 to 5
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-version: '5'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2025-09-01 18:14:06 +00:00
0573e31002
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
2025-08-31 12:07:48 +02:00
2b44464a14
Fix up windows build error in GHA
2025-08-28 06:08:13 -04:00
96ff5f8e70
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-28 00:53:15 -04:00
e33439e523
Update qatest.yaml
...
corrected kurt's machine name to qa-windows-kurt
2025-08-26 15:18:10 -07:00
bbdb46a833
Update qatest.yaml
...
Removed dan's z600 windows machine from the matrix.
Added dan's mac, caleb's mac and kurt's windows machines.
2025-08-26 14:41:07 -07:00
7cf3d31190
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2025-08-25 20:26:06 +02:00
ba30737d8f
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-20 18:04:55 -04:00
e8b42af7a7
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-19 19:16:16 +02:00
70768b815f
Final permutation test. try gcc-13 and hope.
2025-08-17 21:38:24 +01:00
d7e2e91dca
Merge branch 'try-22.04'
2025-08-17 21:18:28 +01:00
e7a0751a2c
Try g++-14 on the slow older runners :-(
2025-08-17 21:15:14 +01:00
2339174f66
Ubuntu 22.04 python is not python3 (I think)
2025-08-17 14:47:11 +01:00
dabf5cc037
Fx indent
2025-08-17 14:26:21 +01:00
979593d5fb
Workaround container needing 22.04 python
2025-08-17 14:18:02 +01:00
99238dd031
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-16 23:32:53 +02:00
bcaa272e91
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/gltf/asset.cpp
2025-08-16 12:35:36 +02:00
6833849876
Need to adjust runs-on to pick up the container properly
2025-08-15 18:12:38 +01:00
16a2ae0179
Use sudo inside dockerised Ubuntu
2025-08-15 17:02:34 +01:00
a43c11bbaa
Test containerised build on Linux with g++14 toolchain.
2025-08-15 14:22:21 +01:00
440c7f214e
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-13 20:31:56 +02:00
b0b8328c5c
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llrendertarget.cpp
# indra/newview/gltf/asset.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoicewebrtc.cpp
# indra/newview/viewer_manifest.py
2025-08-12 22:50:51 +02:00
b9559762bc
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-12 18:31:29 +02:00
3dcad73d2e
Reduce lifetime of Beta to 28 days
...
Too many old betas hang around. These add no value in testing.
Beta now 28, Alpha and Nightly both at 14
2025-08-10 10:00:46 +01:00
e33936b5c8
Add the fontconfgi1-dev package dependency
...
CMake failing on 24.04, did not on 22.04 so default package setup must have changed? Either that or pkg-config is being a pain.
2025-08-10 09:56:33 +01:00
47dbce2fa9
Move to Ubuntu 24.04 runner
2025-08-09 19:08:58 +01:00
c14d0d50b1
Update macOS version for build matrix
...
macos-14 to macos-15 aligns with LL
2025-08-09 15:24:42 +01:00
d7c73b9364
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-09 02:24:24 +02:00
c43b544dc6
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202505
2025-08-06 18:26:27 +02:00
e4a25dc5b9
Merge branch 'develop' into atlas-qaworkflow
2025-08-06 09:42:26 -04:00
acc8928330
Merge release/2025.05 into develop
2025-08-06 14:17:18 +03:00
c1450afe6e
Bump azure/trusted-signing-action from 0.5.1 to 0.5.9
...
Bumps [azure/trusted-signing-action](https://github.com/azure/trusted-signing-action ) from 0.5.1 to 0.5.9.
- [Release notes](https://github.com/azure/trusted-signing-action/releases )
- [Commits](https://github.com/azure/trusted-signing-action/compare/v0.5.1...v0.5.9 )
---
updated-dependencies:
- dependency-name: azure/trusted-signing-action
dependency-version: 0.5.9
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2025-08-01 11:01:50 +00:00
9311b522d8
Add new runners to QA workflow
2025-07-30 13:56:44 -07:00
a4e8af0dce
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/pull_request_template.md
# CONTRIBUTING.md
# indra/newview/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/res/viewerRes.rc
# indra/newview/skins/default/xui/de/panel_login_first.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_login_first.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
# indra/newview/skins/default/xui/en/panel_status_bar.xml
# indra/newview/skins/default/xui/es/panel_login_first.xml
# indra/newview/skins/default/xui/fr/panel_login_first.xml
# indra/newview/skins/default/xui/it/panel_login_first.xml
# indra/newview/skins/default/xui/ja/panel_login_first.xml
# indra/newview/skins/default/xui/pl/panel_login_first.xml
# indra/newview/skins/default/xui/pt/panel_login_first.xml
# indra/newview/skins/default/xui/ru/panel_login_first.xml
# indra/newview/skins/default/xui/tr/panel_login_first.xml
# indra/newview/skins/default/xui/zh/panel_login_first.xml
# indra/newview/viewer_manifest.py
2025-07-30 10:52:39 +02:00
632bcd3d1e
Add media request to pull_request_template.md ( #4440 )
...
* Add media request to pull_request_template.md
A picture can be worth a thousand words. Prompt users to provide media when creating a PRs.
* Update pull_request_template.md
2025-07-26 11:29:12 -07:00
bfd99549b0
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/pull_request_template.md
# indra/llappearance/lltexlayer.cpp
# indra/llcommon/llthread.cpp
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/lldaeloader.h
# indra/llprimitive/llmodel.cpp
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llmodelpreview.cpp
# indra/newview/lltoolpie.cpp
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-18 14:14:54 +02:00
Ansariel