Commit 471f82e7 authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Merged with Inventory-Misc tip

--HG--
branch : .Catznip
parents df5814ea b0d83673
4c96598948f0485816e4fcb9793dfaa0185c15cb
\ No newline at end of file
20d1cf2fbef1a6b192d61ab3bbe02fe5fd84dfec
\ No newline at end of file
......@@ -575,7 +575,9 @@ bool LLAvatarTracker::updateCallingCards(const LLUUID& buddy_id)
LLInventoryModel::cat_array_t cats;
LLInventoryModel::item_array_t items;
LLParticularBuddyCollector f(buddy_id);
gInventory.collectDescendentsIf(gInventory.getRootFolderID(), cats, items, LLInventoryModel::INCLUDE_TRASH, f);
const LLUUID idCallingCards = gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD);
gInventory.collectDescendentsIf(idCallingCards, cats, items, LLInventoryModel::EXCLUDE_TRASH, f);
for (LLInventoryModel::item_array_t::iterator itItem = items.begin(); itItem != items.end(); ++itItem)
gInventory.addChangedMask(LLInventoryObserver::LABEL, (*itItem)->getUUID());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment