summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.h
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-08-19 19:59:03 +0800
committerErik Kundiman <erik@megapahit.org>2024-08-19 19:59:03 +0800
commit495f103000137b3288eaa05a4298fd33ceb3c2dc (patch)
tree19b79a5cb33275a874d24e923a04de7b9657401b /indra/newview/llvoicevivox.h
parentb7a79709003b1f7f0451ba577576040fc03e50f9 (diff)
parent0f3ffb0fad721740f20ed5c7a74f4ceade6d46b6 (diff)
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llvoicevivox.h')
-rw-r--r--indra/newview/llvoicevivox.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index c40c84cef3..f94da7bd7a 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();