diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-02-01 09:20:11 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-02-22 23:11:37 -0800 |
| commit | bc05e7dcf4d64873816a96f04d6772c2a75be37c (patch) | |
| tree | 072ac7756d1a4f6b6d4348205703964ee6417486 /indra/newview/llimview.cpp | |
| parent | d3ab894c879bbd5c5e4fc7ccd61b8c0e78d7dc67 (diff) | |
checkpoint p2p/adhoc voice
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 3e03dbef8f..78017337e8 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -681,10 +681,15 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& { mSessionType = GROUP_SESSION; } - else + else if (LLVoiceClient::getInstance()->hasP2PInterface()) { mSessionType = ADHOC_SESSION; } + else + { + // webrtc uses adhoc channels for p2p + mSessionType = P2P_SESSION; + } } if(mVoiceChannel) |