diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-01 15:40:41 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-01 15:40:41 -0700 |
| commit | 002be0f24321164a74ef2a88c656b7cb0968c7d3 (patch) | |
| tree | 6a5a5944f8c5111bdf4e3364f28e003f38dc682f /indra/newview/llvoicewebrtc.h | |
| parent | 2d69e4d2396d4d5d2e2b9d4959e668e57c08efd0 (diff) | |
| parent | 5f66a15142083a047ac945da94f167c24c95f49a (diff) | |
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llvoicewebrtc.h')
| -rw-r--r-- | indra/newview/llvoicewebrtc.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h index 480a7897cd..2b9a113fcc 100644 --- a/indra/newview/llvoicewebrtc.h +++ b/indra/newview/llvoicewebrtc.h @@ -62,7 +62,8 @@ extern const std::string WEBRTC_VOICE_SERVER_TYPE; class LLWebRTCVoiceClient : public LLSingleton<LLWebRTCVoiceClient>, virtual public LLVoiceModuleInterface, public llwebrtc::LLWebRTCDevicesObserver, - public LLMuteListObserver + public LLMuteListObserver, + public llwebrtc::LLWebRTCLogCallback { LLSINGLETON(LLWebRTCVoiceClient); LOG_CLASS(LLWebRTCVoiceClient); @@ -84,7 +85,15 @@ public: // Returns true if WebRTC has successfully logged in and is not in error state bool isVoiceWorking() const override; - std::string sipURIFromID(const LLUUID &id) override; + std::string sipURIFromID(const LLUUID &id) const override; + LLSD getP2PChannelInfoTemplate(const LLUUID& id) const override; + + + /////////////////// + /// @name Logging + /// @{ + void LogMessage(llwebrtc::LLWebRTCLogCallback::LogLevel level, const std::string& message) override; + //@} ///////////////////// /// @name Tuning |