diff options
author | Roxie Linden <roxie@lindenlab.com> | 2023-09-22 12:40:16 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2024-02-22 23:11:34 -0800 |
commit | baf01e50cfc1d59c5853aad3948f6e741995ee62 (patch) | |
tree | c6fe209c99f0f97a87099541131cdf5acdcd7c30 | |
parent | fc5075dda58be36133b5795e056be7ff2f1e822b (diff) |
join notification was going out before session was created.
-rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 3942f4171d..3073a58183 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -1121,6 +1121,13 @@ bool LLWebRTCVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession // add 'self' participant. addParticipantByID(gAgent.getID()); + // tell peers that this participant has joined. + + Json::FastWriter writer; + Json::Value root; + root["j"] = true; + std::string json_data = writer.write(root); + mWebRTCDataInterface->sendData(json_data, false); notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_JOINED); @@ -2681,12 +2688,7 @@ void LLWebRTCVoiceClient::OnDataReceived(const std::string& data, bool binary) void LLWebRTCVoiceClient::OnDataChannelReady() { - // send a join - Json::FastWriter writer; - Json::Value root; - root["j"] = true; - std::string json_data = writer.write(root); - mWebRTCDataInterface->sendData(json_data, false); + } |