From 7b7667973b3ecaa857f1013c8084f3159105eec1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 23 Nov 2020 14:29:07 +0200
Subject: DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507

See changes from SL-13119 and SL-13190
---
 indra/llui/llfolderviewmodel.cpp                               | 10 ----------
 indra/newview/skins/default/xui/en/menu_wearable_list_item.xml |  8 --------
 2 files changed, 18 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();
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index 46b8b042d5..20c81c983b 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/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"
-- 
cgit v1.2.3