diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 16:20:43 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 16:20:43 -0500 |
| commit | a165279acd57c6c0e2e6492b7de39a9e614327af (patch) | |
| tree | 760aa1d26655261591e06284390e44956a6c008c | |
| parent | 973e2143d23cad915a320dceccf4c2708e1cfa2e (diff) | |
EXT-4902: Assert crash after detaching all and removing all clothes.
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 1414e9ca83..35a45a89be 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4922,7 +4922,6 @@ void LLWearableBridge::onRemoveFromAvatarArrived(LLWearable* wearable, { llwarns << "Found " << items.size() << " COF links to " << item_id.asString() << ", expected 1" << llendl; } - llassert(items.size() == 1); // Should always have one and only one item linked to this in the COF. for (LLInventoryModel::item_array_t::const_iterator iter = items.begin(); iter != items.end(); ++iter) @@ -4958,7 +4957,10 @@ void LLWearableBridge::removeAllClothesFromAvatar() // Find and remove this item from the COF. LLInventoryModel::item_array_t items = gInventory.collectLinkedItems( item_id, LLAppearanceManager::instance().getCOF()); - llassert(items.size() == 1); // Should always have one and only one item linked to this in the COF. + if (items.size() != 1) + { + llwarns << "Found " << items.size() << " COF links to " << item_id.asString() << ", expected 1" << llendl; + } for (LLInventoryModel::item_array_t::const_iterator iter = items.begin(); iter != items.end(); ++iter) |