diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-14 20:52:00 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-14 20:52:00 +0800 |
| commit | ce8cb73ac37ce59a76c3ebfa684e8f1c94e8fd13 (patch) | |
| tree | 39237632c23f093b2ea9b0490b0a19cb2dee99e9 /indra/newview/llvoicevivox.h | |
| parent | f58cc7facb14ff6b6763652b433524e85a728cc3 (diff) | |
| parent | ab86e77818e76bdf3ef660b9fa964217265be3e7 (diff) | |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llvoicevivox.h')
| -rw-r--r-- | indra/newview/llvoicevivox.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index c2981b301d..eecf0d0776 100644 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -91,6 +91,8 @@ public: // Returns true if vivox has successfully logged in and is not in error state bool isVoiceWorking() const override; + void setHidden(bool hidden) override; // virtual + ///////////////////// /// @name Tuning //@{ @@ -762,7 +764,6 @@ private: LLSD getAudioSessionChannelInfo(); std::string getAudioSessionHandle(); - void setHidden(bool hidden) override; //virtual void sendPositionAndVolumeUpdate(void); void sendCaptureAndRenderDevices(); |