summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-11-02 20:55:56 +0800
committerErik Kundiman <erik@megapahit.org>2024-11-03 19:33:18 +0800
commit3f72f9a202bed628f838cc24fe58a0511ca0d161 (patch)
tree0684cfff91551d9b6aabdb825981b46a5cb53fe8 /indra/newview/llvoiceclient.cpp
parentd302bf3c96666cfd46d7585cb3d8b6ec27bb83bf (diff)
parent9c0a6d1b0e5e9d6da6a63ff367f40ab08c064bbe (diff)
Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 846c2b8867..0e11854019 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -439,6 +439,16 @@ void LLVoiceClient::setRenderDevice(const std::string& name)
#endif
}
+bool LLVoiceClient::isCaptureNoDevice()
+{
+ return LLWebRTCVoiceClient::getInstance()->isCaptureNoDevice();
+}
+
+bool LLVoiceClient::isRenderNoDevice()
+{
+ return LLWebRTCVoiceClient::getInstance()->isRenderNoDevice();
+}
+
const LLVoiceDeviceList& LLVoiceClient::getCaptureDevices()
{
#if !__FreeBSD__
@@ -448,7 +458,6 @@ const LLVoiceDeviceList& LLVoiceClient::getCaptureDevices()
#endif
}
-
const LLVoiceDeviceList& LLVoiceClient::getRenderDevices()
{
#if !__FreeBSD__