livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Notify join on connect instead of on first peer join, for adhoc-p2p incoming calls

meow-7.2.2
Roxie Linden 2024-03-05 11:48:56 -08:00
parent 6d5304bd92
commit 2c2529d3c8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llimview.cpp
View File

@ -731,12 +731,11 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id,
// which uses the voice server to relay calls and invites. Otherwise,
// we use the group voice provider.
mVoiceChannel = new LLVoiceChannelP2P(session_id, name, other_participant_id, outgoingInterface);
mVoiceChannel->setChannelInfo(voiceChannelInfo);
}
else
{
p2pAsAdhocCall = true;
mVoiceChannel = new LLVoiceChannelGroup(session_id, name, true, true);
mVoiceChannel = new LLVoiceChannelGroup(session_id, name, voiceChannelInfo.isUndefined(), true);
}
}
else
@ -754,10 +753,8 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id,
}
}
if(mVoiceChannel)
{
mVoiceChannelStateChangeConnection = mVoiceChannel->setStateChangedCallback(boost::bind(&LLIMSession::onVoiceChannelStateChanged, this, _1, _2, _3));
}
mVoiceChannelStateChangeConnection = mVoiceChannel->setStateChangedCallback(boost::bind(&LLIMSession::onVoiceChannelStateChanged, this, _1, _2, _3));
mVoiceChannel->setChannelInfo(voiceChannelInfo);
mSpeakers = new LLIMSpeakerMgr(mVoiceChannel);