diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-02-01 16:13:32 -0500 | 
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-02-01 16:13:32 -0500 | 
| commit | 1397781c10b42cfe45e6a7878d6975fc5ac1ac02 (patch) | |
| tree | 0e67ccaf32f1784063d86807a9a2d086a52130ba | |
| parent | ec5ad98abe0dde6f314bcd8c67a193a672c53aca (diff) | |
| parent | cef4e2c1748e07b086737d31e544285141bc54d4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 1 | 
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()); | 
