diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-03-10 15:36:58 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-03-10 15:36:58 -0700 |
| commit | d67a3022d3a9432f279768371b27ea5322315905 (patch) | |
| tree | 0254d8a7889ff6639cf6bf9b40f63499df37ceb4 /indra/newview/llvoicevivox.h | |
| parent | fc462b2b0f7ee153626d162bd97a05110f0804b7 (diff) | |
| parent | b242d696ba03f66494dfca1f05a74ed1b15cd6e4 (diff) | |
Merge branch 'main' of github.com:secondlife/viewer-private into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llvoicevivox.h')
| -rw-r--r-- | indra/newview/llvoicevivox.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index 5cd9795f9e..6b40ad0cf6 100644 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -99,6 +99,7 @@ public: void tuningSetMicVolume(float volume) override; void tuningSetSpeakerVolume(float volume) override; float tuningGetEnergy(void) override; + //@} ///////////////////// @@ -138,7 +139,6 @@ public: // NOTE: this will return true if the session can't be found. BOOL isSessionTextIMPossible(const LLUUID &session_id) override; - //////////////////////////// /// @name Channel stuff //@{ @@ -170,6 +170,7 @@ public: // start a voice channel with the specified user void callUser(const LLUUID &uuid) override; void hangup() override; + //@} LLVoiceP2POutgoingCallInterface *getOutgoingCallInterface() override { return this; } @@ -206,8 +207,8 @@ public: //@} // authorize the user - virtual void userAuthorized(const std::string& user_id, - const LLUUID &agentID) override; + void userAuthorized(const std::string& user_id, + const LLUUID &agentID) override; ////////////////////////////// /// @name Status notification |