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

don't send override avatar URL if override matches

Browse source
This commit is contained in:
Stephen Birarda 2018-08-09 22:05:15 -07:00
parent a56e9b0860
commit f9230eca7f
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
assignment-client/src/avatars/AvatarMixerClientData.cpp
View file

@ -178,19 +178,22 @@ void AvatarMixerClientData::checkSkeletonURLAgainstWhitelist(SlaveSharedData *sl
} }
if (!inWhitelist) { if (!inWhitelist) {
// we need to change this avatar's skeleton URL, and send them a traits packet informing them of the change // make sure we're not unecessarily overriding the default avatar with the default avatar
_avatar->setSkeletonModelURL(slaveSharedData->skeletonReplacementURL); if (_avatar->getWireSafeSkeletonModelURL() != slaveSharedData->skeletonReplacementURL) {
// we need to change this avatar's skeleton URL, and send them a traits packet informing them of the change
qDebug() << "Overwriting avatar URL" << _avatar->getWireSafeSkeletonModelURL()
<< "to replacement" << slaveSharedData->skeletonReplacementURL << "for" << sendingNode.getUUID();
_avatar->setSkeletonModelURL(slaveSharedData->skeletonReplacementURL);
qDebug() << "Sending overwritten" << _avatar->getSkeletonModelURL() << "back to sending avatar"; auto packet = NLPacket::create(PacketType::SetAvatarTraits, -1, true);
auto packet = NLPacket::create(PacketType::SetAvatarTraits, -1, true); // the returned set traits packet uses the trait version from the incoming packet
// so the client knows they should not overwrite if they have since changed the trait
// the returned set traits packet uses the trait version from the incoming packet _avatar->packTrait(AvatarTraits::SkeletonModelURL, *packet, traitVersion);
// so the client knows they should not overwrite if they have since changed the trait
_avatar->packTrait(AvatarTraits::SkeletonModelURL, *packet, traitVersion);
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
nodeList->sendPacket(std::move(packet), sendingNode); nodeList->sendPacket(std::move(packet), sendingNode);
}
} }
} }
} }