From 5292e537ea5f5fb21f4669f681e697989c8b391d Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 14 Mar 2016 11:22:01 -0700
Subject: [PATCH] further unmangle merge

---
 libraries/entities/src/EntityTree.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index a1b2af08c0..96cb638d1f 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -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