Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-06 05:42:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clear user's avatar entities if rez permissions change to "no"

Browse source
This commit is contained in:
David Rowe 2021-03-01 22:03:02 +13:00
parent e7a97c6117
commit 3beceb4d7d
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
assignment-client/src/avatars/AvatarMixerSlave.cpp
View file

@ -432,6 +432,13 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
}
}
if (sendAvatar) {
if (!sourceAvatarNode->getCanRezAvatarEntities()) {
auto sourceAvatarNodeData = reinterpret_cast<AvatarMixerClientData*>(sourceAvatarNode->getLinkedData());
sourceAvatarNodeData->getAvatar().clearAvatarEntities();
}
}
if (sendAvatar) {
AvatarDataSequenceNumber lastSeqToReceiver = destinationNodeData->getLastBroadcastSequenceNumber(sourceAvatarNode->getLocalID());
AvatarDataSequenceNumber lastSeqFromSender = sourceAvatarNodeData->getLastReceivedSequenceNumber();

8
libraries/avatars/src/AvatarData.cpp
View file

@ -3046,6 +3046,14 @@ void AvatarData::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFr
}
}
void AvatarData::clearAvatarEntities() {
_avatarEntitiesLock.withReadLock([this] {
foreach(auto entityID, _packedAvatarEntityData.keys()) {
clearAvatarEntity(entityID);
}
});
}
AvatarEntityMap AvatarData::getAvatarEntityData() const {
// overridden where needed
// NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs

2
libraries/avatars/src/AvatarData.h
View file

@ -1186,6 +1186,8 @@ public:
* @deprecated This function is deprecated and will be removed.
*/
Q_INVOKABLE virtual void clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree = true);
void clearAvatarEntities();
/**jsdoc
* Enables blend shapes set using {@link Avatar.setBlendshape} or {@link MyAvatar.setBlendshape} to be transmitted to other