summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoxanne Skelly <roxie@lindenlab.com>2024-09-05 15:07:00 -0700
committerGitHub <noreply@github.com>2024-09-05 15:07:00 -0700
commit33fbcd858ff16f8e8bc9a071f0639f47b1f688ce (patch)
tree7fc634099985b022ddf88cabc69c64f4d69905e1
parenta617dc8fab45353664dbec2d87845ea3af04319a (diff)
parentfe9596bf79659b2dd334fa6332473c8284df7659 (diff)
Merge pull request #2514 from secondlife/roxie/webrtc-race
Fix race condition that was preventing "Voice Call" menu from reliably calling.
-rw-r--r--indra/newview/llavataractions.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 038030a1f6..6f6b89ea81 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -242,10 +242,7 @@ static void on_avatar_name_cache_start_call(const LLUUID& agent_id,
{
std::string name = av_name.getDisplayName();
LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, agent_id, LLSD());
- if (session_id != LLUUID::null)
- {
- gIMMgr->startCall(session_id);
- }
+ gIMMgr->autoStartCallOnStartup(session_id);
make_ui_sound("UISndStartIM");
}