further unmangle merge

This commit is contained in:
Seth Alves 2016-03-14 11:22:01 -07:00
parent 908481d5d4
commit 5292e537ea

View file

@ -1025,7 +1025,6 @@ void EntityTree::fixupMissingParents() {
bool doMove = false;
if (entity->isParentIDValid()) {
// this entity's parent was previously not known, and now is. Update its location in the EntityTree...
iter.remove();
doMove = true;
} else if (getIsServer() && _avatarIDs.contains(entity->getParentID())) {
// this is a child of an avatar, which the entity server will never have