Skip to content

Commit ce1fe48

Browse files
committed
Clean up unused code
1 parent 84a122d commit ce1fe48

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

indra/newview/llappearancemgr.cpp

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,6 @@ class LLWearableHoldingPattern
705705
bool pollMissingWearables();
706706
bool isMissingCompleted();
707707
void recoverMissingWearable(LLWearableType::EType type);
708-
void clearCOFLinksForMissingWearables();
709708

710709
void onWearableAssetFetch(LLViewerWearable *wearable);
711710
void onAllComplete();
@@ -1117,20 +1116,6 @@ bool LLWearableHoldingPattern::isMissingCompleted()
11171116
return mTypesToLink.size()==0 && mTypesToRecover.size()==0;
11181117
}
11191118

1120-
void LLWearableHoldingPattern::clearCOFLinksForMissingWearables()
1121-
{
1122-
for (found_list_t::iterator it = getFoundList().begin(); it != getFoundList().end(); ++it)
1123-
{
1124-
LLFoundData &data = *it;
1125-
if ((data.mWearableType < LLWearableType::WT_COUNT) && (!data.mWearable))
1126-
{
1127-
// Wearable link that was never resolved; remove links to it from COF
1128-
LL_INFOS("Avatar") << self_av_string() << "HP " << index() << " removing link for unresolved item " << data.mItemID.asString() << LL_ENDL;
1129-
LLAppearanceMgr::instance().removeCOFItemLinks(data.mItemID);
1130-
}
1131-
}
1132-
}
1133-
11341119
bool LLWearableHoldingPattern::pollMissingWearables()
11351120
{
11361121
if (!isMostRecent())
@@ -1161,14 +1146,6 @@ bool LLWearableHoldingPattern::pollMissingWearables()
11611146

11621147
gAgentAvatarp->debugWearablesLoaded();
11631148

1164-
// BAP - if we don't call clearCOFLinksForMissingWearables()
1165-
// here, we won't have to add the link back in later if the
1166-
// wearable arrives late. This is to avoid corruption of
1167-
// wearable ordering info. Also has the effect of making
1168-
// unworn item links visible in the COF under some
1169-
// circumstances.
1170-
1171-
//clearCOFLinksForMissingWearables();
11721149
onAllComplete();
11731150
}
11741151
return done;
@@ -1215,13 +1192,6 @@ void LLWearableHoldingPattern::handleLateArrivals()
12151192

12161193
replaced_types.insert(data.mWearableType);
12171194

1218-
// BAP - if we didn't call
1219-
// clearCOFLinksForMissingWearables() earlier, we
1220-
// don't need to restore the link here. Fixes
1221-
// wearable ordering problems.
1222-
1223-
// LLAppearanceMgr::instance().addCOFItemLink(data.mItemID,false);
1224-
12251195
// BAP failing this means inventory or asset server
12261196
// are corrupted in a way we don't handle.
12271197
llassert((data.mWearableType < LLWearableType::WT_COUNT) && (wearable->getType() == data.mWearableType));

0 commit comments

Comments
 (0)