From 48801314f5838cb3e549bdbe54e7163ecdd3be26 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <none@none>
Date: Sat, 4 Sep 2010 03:54:37 +0200
Subject: [PATCH] - fixed : crash in LLAppearanceMgr::updateAppearanceFromCOF()
due to "Appearance-SyncAttach" patch -> fixed in "Appearance-Misc", local
fix will dissapear on the next pmerge - fixed :
LLWearableBridge::removeAllClothesFromAvatar() doesn't remove all clothing
from the avatar -> fixed in "Appearance-Misc", local fix will dissapear
on the next pmerge
--HG--
branch : RLVa
---
indra/newview/llappearancemgr.cpp | 2 +-
indra/newview/llinventorybridge.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 9d3e5f1267..9caf31d23b 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1903,7 +1903,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/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 1665286516..aa6974fef6 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4804,7 +4804,7 @@ 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((LLWearableType::EType)itype)-1; index >= 0 ; --index)
{
LLViewerInventoryItem *item = dynamic_cast<LLViewerInventoryItem*>(
gAgentWearables.getWearableInventoryItem((LLWearableType::EType)itype, index));
--
GitLab