Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change

Browse source 
Clear any reliable connection state upon Node ID change
This commit is contained in:
Shannon Romano 2019-05-13 13:11:05 -07:00 committed by GitHub
commit 46d75a61b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/MyAvatar.cpp
View file

@ -3755,6 +3755,7 @@ void MyAvatar::restrictScaleFromDomainSettings(const QJsonObject& domainSettings
void MyAvatar::leaveDomain() { void MyAvatar::leaveDomain() {
clearScaleRestriction(); clearScaleRestriction();
saveAvatarScale(); saveAvatarScale();
prepareResetTraitInstances();
} }
void MyAvatar::saveAvatarScale() { void MyAvatar::saveAvatarScale() {

2
libraries/networking/src/NodeList.cpp
View file

@ -665,6 +665,8 @@ void NodeList::processDomainServerList(QSharedPointer<ReceivedMessage> message)
// tell the domain handler that we're no longer connected so that below // tell the domain handler that we're no longer connected so that below
// it can re-perform actions as if we just connected // it can re-perform actions as if we just connected
_domainHandler.setIsConnected(false); _domainHandler.setIsConnected(false);
// Clear any reliable connections using old ID.
_nodeSocket.clearConnections();
} }
setSessionLocalID(newLocalID); setSessionLocalID(newLocalID);