diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index ee92d8d878..48c3e52c0d 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1498,6 +1498,9 @@ void LLAppearanceMgr::onOutfitRename(const LLSD& notification, const LLSD& respo LLStringUtil::trim(outfit_name); if (!outfit_name.empty()) { + // Debug code for FIRE-15571 + LL_INFOS() << "OUTFIT RENAME: Invoking rename_category()" << LL_ENDL; + LLUUID cat_id = notification["payload"]["cat_id"].asUUID(); rename_category(&gInventory, cat_id, outfit_name); } diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index 160e95e132..992f8cea8a 100755 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -632,6 +632,9 @@ void LLOutfitsList::refreshList(const LLUUID& category_id) } } + // Debug code for FIRE-15571 + LL_INFOS() << "OUTFIT RENAME: Outfits folder changed - processing changed categories" << LL_ENDL; + // Get changed items from inventory model and update outfit tabs // which might have been renamed. const LLInventoryModel::changed_items_t& changed_items = gInventory.getChangedIDs(); @@ -642,6 +645,9 @@ void LLOutfitsList::refreshList(const LLUUID& category_id) updateOutfitTab(*items_iter); } + // Debug code for FIRE-15571 + LL_INFOS() << "OUTFIT RENAME: Outfits folder changed - processing changed categories FINISHED" << LL_ENDL; + mAccordion->sort(); } @@ -887,11 +893,21 @@ void LLOutfitsList::computeDifference( void LLOutfitsList::updateOutfitTab(const LLUUID& category_id) { + // Debug code for FIRE-15571 + LL_INFOS() << "OUTFIT RENAME: Trying to update outfit tab for category" << category_id.asString() << LL_ENDL; + outfits_map_t::iterator outfits_iter = mOutfitsMap.find(category_id); if (outfits_iter != mOutfitsMap.end()) { LLViewerInventoryCategory *cat = gInventory.getCategory(category_id); - if (!cat) return; + // Debug code for FIRE-15571 + //if (!cat) return; + if (!cat) + { + LL_INFOS() << "OUTFIT RENAME: Could not find inventory category" << LL_ENDL; + return; + } + // std::string name = cat->getName(); @@ -899,10 +915,16 @@ void LLOutfitsList::updateOutfitTab(const LLUUID& category_id) LLAccordionCtrlTab* tab = outfits_iter->second; if (tab) { + // Debug code for FIRE-15571 + LL_INFOS() << "OUTFIT RENAME: Updating tab name" << LL_ENDL; tab->setName(name); tab->setTitle(name); } + // Debug code for FIRE-15571 + else LL_INFOS() << "OUTFIT RENAME: Cannot update tab name" << LL_ENDL; } + // Debug code for FIRE-15571 + else LL_INFOS() << "OUTFIT RENAME: Category id is not in outfit map" << LL_ENDL; } void LLOutfitsList::resetItemSelection(LLWearableItemsList* list, const LLUUID& category_id)