livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2244 from secondlife/roxie/webrtc-teleport 

[WebRTC] After transition through WebRTC -> Vivox -> WebRTC regions, voice dot is on but no voice is transmitted.
master
Roxanne Skelly 2024-08-09 13:34:06 -07:00 committed by GitHub
parent 4e0819b2dc 227b212dc6
commit 5cff84ff34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llvoiceclient.cpp
View File

@ -281,10 +281,8 @@ void LLVoiceClient::setNonSpatialVoiceModule(const std::string &voice_server_typ
void LLVoiceClient::setHidden(bool hidden)
{
if (mSpatialVoiceModule)
{
mSpatialVoiceModule->setHidden(hidden);
}
LLWebRTCVoiceClient::getInstance()->setHidden(hidden);
LLVivoxVoiceClient::getInstance()->setHidden(hidden);
}
void LLVoiceClient::terminate()

3
indra/newview/llvoicevivox.h
View File

@ -89,6 +89,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
//@{
@ -760,7 +762,6 @@ private:
LLSD getAudioSessionChannelInfo();
std::string getAudioSessionHandle();
void setHidden(bool hidden) override; //virtual
void sendPositionAndVolumeUpdate(void);
void sendCaptureAndRenderDevices();

3
indra/newview/llvoicewebrtc.h
View File

@ -88,6 +88,7 @@ public:
std::string sipURIFromID(const LLUUID &id) const override;
LLSD getP2PChannelInfoTemplate(const LLUUID& id) const override;
void setHidden(bool hidden) override; // virtual
///////////////////
/// @name Logging
@ -480,8 +481,6 @@ private:
LLSD getAudioSessionChannelInfo();
void setHidden(bool hidden) override; //virtual
void enforceTether();
void updateNeighboringRegions();