summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2024-02-01 09:20:11 -0800
committerRoxie Linden <roxie@lindenlab.com>2024-02-08 18:35:55 -0800
commitecd6b87b195321f522e27e5f62fe33eeaec48b4e (patch)
treec13b17e7e2244c0b0bb9f355929e05ddc9baf36b /indra/newview/llimview.cpp
parent4b65e2b266d689028d627d0fbe6f2d97c997e7ed (diff)
checkpoint p2p/adhoc voice
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp7
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)