Merge pull request #10487 from zfox23/removeExtraneousSendIdentity

Remove extraneous calls to sendIdentityPacket()
This commit is contained in:
Zach Fox 2017-05-17 15:20:09 -07:00 committed by GitHub
commit c5a5cad76d
2 changed files with 1 additions and 4 deletions

View file

@ -5258,9 +5258,8 @@ void Application::nodeActivated(SharedNodePointer node) {
}
if (node->getType() == NodeType::AvatarMixer) {
// new avatar mixer, send off our identity packet right away
// new avatar mixer, send off our identity packet on next update loop
getMyAvatar()->markIdentityDataChanged();
getMyAvatar()->sendIdentityPacket();
getMyAvatar()->resetLastSent();
}
}

View file

@ -1588,8 +1588,6 @@ void AvatarData::setDisplayName(const QString& displayName) {
_displayName = displayName;
_sessionDisplayName = "";
sendIdentityPacket();
qCDebug(avatars) << "Changing display name for avatar to" << displayName;
markIdentityDataChanged();
}