diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-04-22 01:23:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 01:23:35 -0700 |
| commit | b09070a3acc229a933f2001c0025c913240d823b (patch) | |
| tree | 45cb5b6dcdfd6d458c87951c794f269b96bcce0d /indra/newview/llimview.cpp | |
| parent | da79a4d23ad10fa8a508b48e4e2c6cd9651f0295 (diff) | |
| parent | 98322d5f070b260f1e46eb5d9fcd54fa43151329 (diff) | |
Merge pull request #1295 from secondlife/roxie/webrtc-voice
[WebRTC] Outgoing calls now use the voice server type corresponding to the region the agent is on.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 9c8fcd3283..efa8bd2109 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -424,10 +424,6 @@ void startConferenceCoro(std::string url, postData["method"] = "start conference"; postData["session-id"] = tempSessionId; postData["params"] = agents; - LLSD altParams; - altParams["voice_server_type"] = gSavedSettings.getString("VoiceServerType"); - postData["alt_params"] = altParams; - LLSD result = httpAdapter->postAndSuspend(httpRequest, url, postData); LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS]; @@ -466,10 +462,6 @@ void startP2PVoiceCoro(std::string url, LLUUID sessionID, LLUUID creatorId, LLUU postData["method"] = "start p2p voice"; postData["session-id"] = sessionID; postData["params"] = otherParticipantId; - LLSD altParams; - altParams["voice_server_type"] = gSavedSettings.getString("VoiceServerType"); - postData["alt_params"] = altParams; - LLSD result = httpAdapter->postAndSuspend(httpRequest, url, postData); LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS]; @@ -2119,7 +2111,7 @@ bool LLIMModel::sendStartSession( //we also need to wait for reply from the server in case of ad-hoc chat (we'll get new session id) return true; } - else if ((dialog == IM_SESSION_P2P_INVITE) || (dialog == IM_NOTHING_SPECIAL)) + else if (p2p_as_adhoc_call && ((dialog == IM_SESSION_P2P_INVITE) || (dialog == IM_NOTHING_SPECIAL))) { LLViewerRegion *region = gAgent.getRegion(); if (region) |