Skip to content
Snippets Groups Projects
Commit 661b6d12 authored by Roxie Linden's avatar Roxie Linden
Browse files

Don't call virtual functions in a derived class constructor

parent 8897ebeb
No related branches found
No related tags found
No related merge requests found
...@@ -2150,20 +2150,9 @@ LLVoiceWebRTCConnection::LLVoiceWebRTCConnection(const LLUUID &regionID, const s ...@@ -2150,20 +2150,9 @@ LLVoiceWebRTCConnection::LLVoiceWebRTCConnection(const LLUUID &regionID, const s
mOutstandingRequests(0), mOutstandingRequests(0),
mChannelID(channelID), mChannelID(channelID),
mRegionID(regionID), mRegionID(regionID),
mPrimary(false), mPrimary(true),
mRetryWaitPeriod(0) mRetryWaitPeriod(0)
{ {
if (isSpatial())
{
if (gAgent.getRegion())
{
mPrimary = (regionID == gAgent.getRegion()->getRegionID());
}
}
else
{
mPrimary = true;
}
// retries wait a short period...randomize it so // retries wait a short period...randomize it so
// all clients don't try to reconnect at once. // all clients don't try to reconnect at once.
...@@ -3065,6 +3054,10 @@ LLVoiceWebRTCSpatialConnection::LLVoiceWebRTCSpatialConnection(const LLUUID &reg ...@@ -3065,6 +3054,10 @@ LLVoiceWebRTCSpatialConnection::LLVoiceWebRTCSpatialConnection(const LLUUID &reg
LLVoiceWebRTCConnection(regionID, channelID), LLVoiceWebRTCConnection(regionID, channelID),
mParcelLocalID(parcelLocalID) mParcelLocalID(parcelLocalID)
{ {
if (gAgent.getRegion())
{
mPrimary = (regionID == gAgent.getRegion()->getRegionID());
}
} }
LLVoiceWebRTCSpatialConnection::~LLVoiceWebRTCSpatialConnection() LLVoiceWebRTCSpatialConnection::~LLVoiceWebRTCSpatialConnection()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment