diff --git a/.hgpatchinfo/Appearance-Misc.dep b/.hgpatchinfo/Appearance-Misc.dep index 4c5ae37c8bbbb8852db3f8b81409402c0f059ded..e6f63b631217945b4950319cfd484229dc8ddc94 100644 --- a/.hgpatchinfo/Appearance-Misc.dep +++ b/.hgpatchinfo/Appearance-Misc.dep @@ -1 +1 @@ -c5730f8d056e8f7a9f0a7416787ed9cb9bc77fc8 \ No newline at end of file +d2e09cac94057f89e59295dc83b7c17abb8380a5 \ No newline at end of file diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index f846e9e32e7931c8ee05d49350db1bbe41c11a95..e9e5563e34f171053f024b637046b9ba6fdba8d3 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1726,7 +1726,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering) const LLUUID& idItem = *itPendingObjLink; if (!gAgentAvatarp->isWearingAttachment(idItem)) { - mPendingObjLinks.erase(itPendingObjLink++); + itPendingObjLink = mPendingObjLinks.erase(itPendingObjLink); continue; } diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 64e161e1dec687e34bab39de1ecfc1fbdf2e69fa..9f7a29b8e481e47108b4cc20c3d676d3a6714294 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -225,7 +225,7 @@ public: void onRegisterAttachmentComplete(const LLUUID& idItem) { const LLUUID& idItemBase = gInventory.getLinkedItemID(idItem); - uuid_vec_t::const_iterator itPendingObjLink = std::find(mPendingObjLinks.begin(), mPendingObjLinks.end(), idItemBase); + uuid_vec_t::iterator itPendingObjLink = std::find(mPendingObjLinks.begin(), mPendingObjLinks.end(), idItemBase); if (itPendingObjLink != mPendingObjLinks.end()) mPendingObjLinks.erase(itPendingObjLink); } diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 81174730c702c7a89ca93933734ec9e3846c3573..78327a25fbb7341ff4b69d669b41229efb893b7d 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4708,7 +4708,10 @@ void LLWearableBridge::removeAllClothesFromAvatar() if (itype == LLWearableType::WT_SHAPE || itype == LLWearableType::WT_SKIN || itype == LLWearableType::WT_HAIR || itype == LLWearableType::WT_EYES) continue; - for (S32 index = gAgentWearables.getWearableCount(itype)-1; index >= 0 ; --index) +// for (S32 index = gAgentWearables.getWearableCount(itype)-1; index >= 0 ; --index) +// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-09-04 (Catznip-2.1.2a) | Added: Catznip-2.1.2a + for (S32 index = gAgentWearables.getWearableCount((LLWearableType::EType)itype)-1; index >= 0 ; --index) +// [/SL:KB] { LLViewerInventoryItem *item = dynamic_cast<LLViewerInventoryItem*>( gAgentWearables.getWearableInventoryItem((LLWearableType::EType)itype, index));