diff options
author | Brad Linden <brad@lindenlab.com> | 2024-08-20 09:44:14 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-08-20 09:44:14 -0700 |
commit | 68f712615f6858d66aef1d030fb18debb1a2dae4 (patch) | |
tree | 08a0b93af46ca152d72238dffd9543af1b19ce2c /indra/llwebrtc/llwebrtc_impl.h | |
parent | 9f7dd0177201fe080c287144b99a70125be1fb2b (diff) | |
parent | 1d017b76292cf8c7afad34ec54d7401e2f1795e5 (diff) |
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
# autobuild.xml
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to 'indra/llwebrtc/llwebrtc_impl.h')
-rw-r--r-- | indra/llwebrtc/llwebrtc_impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h index 9504e6573b..b93a1fdb01 100644 --- a/indra/llwebrtc/llwebrtc_impl.h +++ b/indra/llwebrtc/llwebrtc_impl.h @@ -278,6 +278,8 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceS // enables/disables capture via the capture device void setRecording(bool recording); + void setPlayout(bool playing); + protected: LLWebRTCLogSink* mLogSink; |