History

make sure to lock data

Dante Ruiz committed 9 years ago

Commit 21d760a1 parent 282b3643 files · +9 −1Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−0
@@ -502,6 +502,8 @@ void EntityScriptingInterface::deleteEntity(QUuid id) { · 501 unmodified lines
502502 AvatarSharedPointer myAvatar = avatarHashMap->getAvatarBySessionID(myNodeID);
503503 if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
504504 // don't delete other avatar's avatarEntities
505+ // If you actually own the entity but the onwership is not set because of a domain switch
506+ // the line below make sure the entity is deleted.
505507 myAvatar->insertDetachedEntityID(id);
506508 shouldDelete = false;
507509 return;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t