diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-17 11:54:34 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-17 11:54:34 +0800 |
| commit | 551224d0d0c0d8866432b3610e9c042a3f4ad6ba (patch) | |
| tree | d9ea5aaacbc84a034b164e2c5b08155cd93daf00 /indra/llwebrtc | |
| parent | f9fc80f5d391f780ee19b4031021819c36ff28a7 (diff) | |
Reenable OnDevicesUpdated on all platforms
but not as "override" on the less supported ones.
Diffstat (limited to 'indra/llwebrtc')
| -rw-r--r-- | indra/llwebrtc/llwebrtc.cpp | 2 | ||||
| -rw-r--r-- | indra/llwebrtc/llwebrtc_impl.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp index 6c501c0ca6..b776591b23 100644 --- a/indra/llwebrtc/llwebrtc.cpp +++ b/indra/llwebrtc/llwebrtc.cpp @@ -556,7 +556,6 @@ void LLWebRTCImpl::updateDevices() } } -#if __x86_64__ && !__FreeBSD__ void LLWebRTCImpl::OnDevicesUpdated() { // reset these to a bad value so an update is forced @@ -565,7 +564,6 @@ void LLWebRTCImpl::OnDevicesUpdated() updateDevices(); } -#endif void LLWebRTCImpl::setTuningMode(bool enable) diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h index 719c8b7eeb..eb675f4062 100644 --- a/indra/llwebrtc/llwebrtc_impl.h +++ b/indra/llwebrtc/llwebrtc_impl.h @@ -171,9 +171,11 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface // // AudioDeviceSink // + void OnDevicesUpdated() #if __x86_64__ && !__FreeBSD__ - void OnDevicesUpdated() override; + override #endif + ; // // Helpers |