@@ -700,7 +700,6 @@ class LLWearableHoldingPattern
700
700
bool pollMissingWearables ();
701
701
bool isMissingCompleted ();
702
702
void recoverMissingWearable (LLWearableType::EType type);
703
- void clearCOFLinksForMissingWearables ();
704
703
705
704
void onWearableAssetFetch (LLViewerWearable *wearable);
706
705
void onAllComplete ();
@@ -1112,20 +1111,6 @@ bool LLWearableHoldingPattern::isMissingCompleted()
1112
1111
return mTypesToLink .size ()==0 && mTypesToRecover .size ()==0 ;
1113
1112
}
1114
1113
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
-
1129
1114
bool LLWearableHoldingPattern::pollMissingWearables ()
1130
1115
{
1131
1116
if (!isMostRecent ())
@@ -1156,14 +1141,6 @@ bool LLWearableHoldingPattern::pollMissingWearables()
1156
1141
1157
1142
gAgentAvatarp ->debugWearablesLoaded ();
1158
1143
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();
1167
1144
onAllComplete ();
1168
1145
}
1169
1146
return done;
@@ -1210,13 +1187,6 @@ void LLWearableHoldingPattern::handleLateArrivals()
1210
1187
1211
1188
replaced_types.insert (data.mWearableType );
1212
1189
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
-
1220
1190
// BAP failing this means inventory or asset server
1221
1191
// are corrupted in a way we don't handle.
1222
1192
llassert ((data.mWearableType < LLWearableType::WT_COUNT) && (wearable->getType () == data.mWearableType ));
0 commit comments