diff options
Diffstat (limited to 'indra/newview/llvoicewebrtc.h')
| -rw-r--r-- | indra/newview/llvoicewebrtc.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h index f81c8c556e..38d867db8d 100644 --- a/indra/newview/llvoicewebrtc.h +++ b/indra/newview/llvoicewebrtc.h @@ -150,8 +150,9 @@ public: bool setSpatialChannel(const std::string &uri, const std::string &credentials) override { + leaveNonSpatialChannel(); // this is a vivox-related call - return false; + return true; } void leaveNonSpatialChannel() override; @@ -775,6 +776,8 @@ class LLVoiceWebRTCConnection : bool connectionStateMachine(); + virtual bool isSpatial() = 0; + LLUUID getRegionID() { return mRegionID; } void shutDown() @@ -875,6 +878,8 @@ class LLVoiceWebRTCSpatialConnection : void setMuteMic(bool muted) override; + bool isSpatial() override { return true; } + protected: @@ -890,6 +895,8 @@ class LLVoiceWebRTCAdHocConnection : public LLVoiceWebRTCConnection virtual ~LLVoiceWebRTCAdHocConnection(); + bool isSpatial() override { return false; } + protected: bool requestVoiceConnection() override; |