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

Don't call virtual functions in a derived class constructor

master
Roxie Linden 2024-08-14 15:22:15 -07:00
parent 8897ebeb6a
commit 661b6d12a0
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llvoicewebrtc.cpp
View File

@ -2150,20 +2150,9 @@ LLVoiceWebRTCConnection::LLVoiceWebRTCConnection(const LLUUID &regionID, const s
mOutstandingRequests(0),
mChannelID(channelID),
mRegionID(regionID),
mPrimary(false),
mPrimary(true),
mRetryWaitPeriod(0)
{
if (isSpatial())
{
if (gAgent.getRegion())
{
mPrimary = (regionID == gAgent.getRegion()->getRegionID());
}
}
else
{
mPrimary = true;
}
// retries wait a short period...randomize it so
// all clients don't try to reconnect at once.
@ -3065,6 +3054,10 @@ LLVoiceWebRTCSpatialConnection::LLVoiceWebRTCSpatialConnection(const LLUUID &reg
LLVoiceWebRTCConnection(regionID, channelID),
mParcelLocalID(parcelLocalID)
{
if (gAgent.getRegion())
{
mPrimary = (regionID == gAgent.getRegion()->getRegionID());
}
}
LLVoiceWebRTCSpatialConnection::~LLVoiceWebRTCSpatialConnection()