Skip to content

Commit 376cd0f

Browse files
committed
Clean up unused code
1 parent 5c16ae1 commit 376cd0f

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
@@ -700,7 +700,6 @@ class LLWearableHoldingPattern
700700
bool pollMissingWearables();
701701
bool isMissingCompleted();
702702
void recoverMissingWearable(LLWearableType::EType type);
703-
void clearCOFLinksForMissingWearables();
704703

705704
void onWearableAssetFetch(LLViewerWearable *wearable);
706705
void onAllComplete();
@@ -1112,20 +1111,6 @@ bool LLWearableHoldingPattern::isMissingCompleted()
11121111
return mTypesToLink.size()==0 && mTypesToRecover.size()==0;
11131112
}
11141113

1115-
void LLWearableHoldingPattern::clearCOFLinksForMissingWearables()
1116-
{
1117-
for (found_list_t::iterator it = getFoundList().begin(); it != getFoundList().end(); ++it)
1118-
{
1119-
LLFoundData &data = *it;
1120-
if ((data.mWearableType < LLWearableType::WT_COUNT) && (!data.mWearable))
1121-
{
1122-
// Wearable link that was never resolved; remove links to it from COF
1123-
LL_INFOS("Avatar") << self_av_string() << "HP " << index() << " removing link for unresolved item " << data.mItemID.asString() << LL_ENDL;
1124-
LLAppearanceMgr::instance().removeCOFItemLinks(data.mItemID);
1125-
}
1126-
}
1127-
}
1128-
11291114
bool LLWearableHoldingPattern::pollMissingWearables()
11301115
{
11311116
if (!isMostRecent())
@@ -1156,14 +1141,6 @@ bool LLWearableHoldingPattern::pollMissingWearables()
11561141

11571142
gAgentAvatarp->debugWearablesLoaded();
11581143

1159-
// BAP - if we don't call clearCOFLinksForMissingWearables()
1160-
// here, we won't have to add the link back in later if the
1161-
// wearable arrives late. This is to avoid corruption of
1162-
// wearable ordering info. Also has the effect of making
1163-
// unworn item links visible in the COF under some
1164-
// circumstances.
1165-
1166-
//clearCOFLinksForMissingWearables();
11671144
onAllComplete();
11681145
}
11691146
return done;
@@ -1210,13 +1187,6 @@ void LLWearableHoldingPattern::handleLateArrivals()
12101187

12111188
replaced_types.insert(data.mWearableType);
12121189

1213-
// BAP - if we didn't call
1214-
// clearCOFLinksForMissingWearables() earlier, we
1215-
// don't need to restore the link here. Fixes
1216-
// wearable ordering problems.
1217-
1218-
// LLAppearanceMgr::instance().addCOFItemLink(data.mItemID,false);
1219-
12201190
// BAP failing this means inventory or asset server
12211191
// are corrupted in a way we don't handle.
12221192
llassert((data.mWearableType < LLWearableType::WT_COUNT) && (wearable->getType() == data.mWearableType));

0 commit comments

Comments
 (0)