DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507

See changes from SL-13119 and SL-13190

1 files changed, 0 insertions, 10 deletions

diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp
index e95cc12520..a028a32704 100644
--- a/indra/llui/llfolderviewmodel.cpp
+++ b/indra/llui/llfolderviewmodel.cpp
@@ -88,16 +88,6 @@ void LLFolderViewModelItemCommon::dirtyDescendantsFilter()
 //virtual
 void LLFolderViewModelItemCommon::addChild(LLFolderViewModelItem* child)
 {
-    // Avoid duplicates: bail out if that child is already present in the list
-    // Note: this happens when models are created before views
-    child_list_t::const_iterator iter;
-    for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
-    {
-        if (child == *iter)
-        {
-            return;
-        }
-    }
     mChildren.push_back(child);
     child->setParent(this);
     dirtyFilter();