summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-02-01 15:47:25 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-02-01 15:47:25 -0500
commitcef4e2c1748e07b086737d31e544285141bc54d4 (patch)
tree51c0a7464fe04044584eab17d4188e6fb29ee0d1 /indra
parentc339017d2e156a68f1e300a7668f2a9f6e6141f7 (diff)
parent6e7ead6f4f4b87e242c9fc888324092c40ea5043 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappearancemgr.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 8f4ce4498e..5088c65122 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1081,7 +1081,6 @@ void LLAppearanceManager::addCOFItemLink(const LLInventoryItem *item, bool do_up
// MULTI-WEARABLES: revisit if more than one per type is allowed.
else if (areMatchingWearables(vitem,inv_item))
{
- gAgentWearables.removeWearable(inv_item->getWearableType(),true,0);
if (inv_item->getIsLinkType())
{
gInventory.purgeObject(inv_item->getUUID());