From 65fcf898bee3579cdc536836edba3870f0733f52 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Tue, 26 Nov 2019 13:40:37 -0800 Subject: [PATCH] Use null zone id for leaving a screen zone --- .../src/avatars/AvatarMixerClientData.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp index 8f62fe6bc9..5fdbd4cc9a 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.cpp +++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp @@ -167,13 +167,12 @@ int AvatarMixerClientData::parseData(ReceivedMessage& message, const SlaveShared bool isInScreenshareZone = findContainingZone.isInScreenshareZone; if (isInScreenshareZone != _avatar->isInScreenshareZone()) { _avatar->setInScreenshareZone(isInScreenshareZone); - if (isInScreenshareZone) { - auto nodeList = DependencyManager::get(); - auto packet = NLPacket::create(PacketType::AvatarZonePresence, 2 * NUM_BYTES_RFC4122_UUID, true); - packet->write(_avatar->getSessionUUID().toRfc4122()); - packet->write(findContainingZone.screenshareZoneid.toRfc4122()); - nodeList->sendPacket(std::move(packet), nodeList->getDomainSockAddr()); - } + const QUuid& zoneId = isInScreenshareZone ? findContainingZone.screenshareZoneid : QUuid(); + auto nodeList = DependencyManager::get(); + auto packet = NLPacket::create(PacketType::AvatarZonePresence, 2 * NUM_BYTES_RFC4122_UUID, true); + packet->write(_avatar->getSessionUUID().toRfc4122()); + packet->write(zoneId.toRfc4122()); + nodeList->sendPacket(std::move(packet), nodeList->getDomainSockAddr()); } _avatar->setNeedsHeroCheck(false); }