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

Use null zone id for leaving a screen zone

Browse source
This commit is contained in:
Simon Walton 2019-11-26 13:40:37 -08:00
parent 8b2fc968f6
commit 65fcf898be
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,13 +167,12 @@ int AvatarMixerClientData::parseData(ReceivedMessage& message, const SlaveShared
bool isInScreenshareZone = findContainingZone.isInScreenshareZone; bool isInScreenshareZone = findContainingZone.isInScreenshareZone;
if (isInScreenshareZone != _avatar->isInScreenshareZone()) { if (isInScreenshareZone != _avatar->isInScreenshareZone()) {
_avatar->setInScreenshareZone(isInScreenshareZone); _avatar->setInScreenshareZone(isInScreenshareZone);
if (isInScreenshareZone) { const QUuid& zoneId = isInScreenshareZone ? findContainingZone.screenshareZoneid : QUuid();
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
auto packet = NLPacket::create(PacketType::AvatarZonePresence, 2 * NUM_BYTES_RFC4122_UUID, true); auto packet = NLPacket::create(PacketType::AvatarZonePresence, 2 * NUM_BYTES_RFC4122_UUID, true);
packet->write(_avatar->getSessionUUID().toRfc4122()); packet->write(_avatar->getSessionUUID().toRfc4122());
packet->write(findContainingZone.screenshareZoneid.toRfc4122()); packet->write(zoneId.toRfc4122());
nodeList->sendPacket(std::move(packet), nodeList->getDomainSockAddr()); nodeList->sendPacket(std::move(packet), nodeList->getDomainSockAddr());
}
} }
_avatar->setNeedsHeroCheck(false); _avatar->setNeedsHeroCheck(false);
} }