@@ -705,7 +705,6 @@ class LLWearableHoldingPattern
705
705
bool pollMissingWearables ();
706
706
bool isMissingCompleted ();
707
707
void recoverMissingWearable (LLWearableType::EType type);
708
- void clearCOFLinksForMissingWearables ();
709
708
710
709
void onWearableAssetFetch (LLViewerWearable *wearable);
711
710
void onAllComplete ();
@@ -1117,20 +1116,6 @@ bool LLWearableHoldingPattern::isMissingCompleted()
1117
1116
return mTypesToLink .size ()==0 && mTypesToRecover .size ()==0 ;
1118
1117
}
1119
1118
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
-
1134
1119
bool LLWearableHoldingPattern::pollMissingWearables ()
1135
1120
{
1136
1121
if (!isMostRecent ())
@@ -1161,14 +1146,6 @@ bool LLWearableHoldingPattern::pollMissingWearables()
1161
1146
1162
1147
gAgentAvatarp ->debugWearablesLoaded ();
1163
1148
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();
1172
1149
onAllComplete ();
1173
1150
}
1174
1151
return done;
@@ -1215,13 +1192,6 @@ void LLWearableHoldingPattern::handleLateArrivals()
1215
1192
1216
1193
replaced_types.insert (data.mWearableType );
1217
1194
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
-
1225
1195
// BAP failing this means inventory or asset server
1226
1196
// are corrupted in a way we don't handle.
1227
1197
llassert ((data.mWearableType < LLWearableType::WT_COUNT) && (wearable->getType () == data.mWearableType ));
0 commit comments