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

See changes from SL-13119 and SL-13190

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();

indra/newview/skins/default/xui/en/menu_wearable_list_item.xml

@@ -71,14 +71,6 @@
         <on_click
          function="Clothing.TakeOff" />
     </menu_item_call>
-    <menu_item_call
-     label="Edit"
-     layout="topleft"
-     visible="false"
-     name="edit">
-        <on_click
-         function="Wearable.Edit" />
-    </menu_item_call>
     <menu_item_call
      label="Item Profile"
      layout="topleft"