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

FB18573 - Other avatars' avatar entities may appear to be successfully deleted until edited

Browse source 
note: partially revert commit 888f2f64a5 / "Merge pull request #10981 from druiz17/bug/delete-avatar-entity
This commit is contained in:
Alexander Ivash 2018-10-03 02:55:33 +03:00
parent 898ba20f1c
commit 9cf94c968a
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -712,11 +712,6 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
const QUuid myNodeID = nodeList->getSessionUUID(); const QUuid myNodeID = nodeList->getSessionUUID();
if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) { if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
// don't delete other avatar's avatarEntities // don't delete other avatar's avatarEntities
// If you actually own the entity but the onwership property is not set because of a domain switch
// The lines below makes sure the entity is deleted once its properties are set.
auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
AvatarSharedPointer myAvatar = avatarHashMap->getAvatarBySessionID(myNodeID);
myAvatar->insertDetachedEntityID(id);
shouldSendDeleteToServer = false; shouldSendDeleteToServer = false;
return; return;
} }