diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-05-20 12:59:59 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-20 12:59:59 -0700 |
| commit | 3a212d9608492ae64a3a32f80790371b90be9e9e (patch) | |
| tree | fcb3901b838af753e40c2ddd1ce84b95a6c2f603 /indra/newview/llvoicewebrtc.h | |
| parent | c7461061b8113fa258611b1a31f16a119fad1a2c (diff) | |
| parent | e1623bb276f83a43ce7a197e388720c05bdefe61 (diff) | |
Merge branch 'spaces-merge' into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llvoicewebrtc.h')
| -rw-r--r-- | indra/newview/llvoicewebrtc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h index fcd4c04e98..60724a4a2a 100644 --- a/indra/newview/llvoicewebrtc.h +++ b/indra/newview/llvoicewebrtc.h @@ -271,7 +271,7 @@ public: participantStatePtr_t findParticipantByID(const LLUUID& id); static ptr_t matchSessionByChannelID(const std::string& channel_id); - + void shutdownAllConnections(); void revive(); @@ -444,7 +444,7 @@ private: /// Clean up objects created during a voice session. void cleanUp(); - LL::WorkQueue::weak_t mMainQueue; + LL::WorkQueue::weak_t mMainQueue; bool mTuningMode; F32 mTuningMicGain; @@ -605,7 +605,7 @@ class LLVoiceWebRTCConnection : void processIceUpdates(); void processIceUpdatesCoro(); - + virtual void setMuteMic(bool muted); virtual void setMicGain(F32 volume); virtual void setSpeakerVolume(F32 volume); |