diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 5567a55cfa..7d51bafa0f 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1597,9 +1597,6 @@ 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); } @@ -2119,9 +2116,8 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new, // Collect and filter descendents to determine new COF contents. - // - // - Body parts: always include COF contents as a fallback in case any required parts are missing. - // + // - Body parts: always include COF contents as a fallback in case any + // required parts are missing. // Preserve body parts from COF if appending. LLInventoryModel::item_array_t body_items; getDescendentsOfAssetType(cof, body_items, LLAssetType::AT_BODYPART); @@ -2139,9 +2135,7 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new, removeDuplicateItems(body_items); filterWearableItems(body_items, 1, 0); - // // - Wearables: include COF contents only if appending. - // LLInventoryModel::item_array_t wear_items; if (append) getDescendentsOfAssetType(cof, wear_items, LLAssetType::AT_CLOTHING); @@ -2167,9 +2161,7 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new, // [/SL:KB] filterWearableItems(wear_items, 0, LLAgentWearables::MAX_CLOTHING_LAYERS); - // // - Attachments: include COF contents only if appending. - // LLInventoryModel::item_array_t obj_items; if (append) getDescendentsOfAssetType(cof, obj_items, LLAssetType::AT_OBJECT); @@ -2203,9 +2195,7 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new, removeDuplicateItems(obj_items); - // // - Gestures: include COF contents only if appending. - // LLInventoryModel::item_array_t gest_items; if (append) getDescendentsOfAssetType(cof, gest_items, LLAssetType::AT_GESTURE); @@ -3346,23 +3336,17 @@ void LLAppearanceMgr::updateIsDirty() { if (item1->getLinkedUUID() != item2->getLinkedUUID()) { - // Change log tag for easier debugging - //LL_DEBUGS("Avatar") << "link id different " << LL_ENDL; - LL_DEBUGS("Outfit") << "link id different for " << item1->getName() << " " << item2->getName() << LL_ENDL; + LL_DEBUGS("Avatar") << "link id different " << LL_ENDL; } else { if (item1->getName() != item2->getName()) { - // Change log tag for easier debugging - //LL_DEBUGS("Avatar") << "name different " << item1->getName() << " " << item2->getName() << LL_ENDL; - LL_DEBUGS("Outfit") << "name different " << item1->getName() << " " << item2->getName() << LL_ENDL; + LL_DEBUGS("Avatar") << "name different " << item1->getName() << " " << item2->getName() << LL_ENDL; } if (item1->getActualDescription() != item2->getActualDescription()) { - // Change log tag for easier debugging - //LL_DEBUGS("Avatar") << "desc different " << item1->getActualDescription() - LL_DEBUGS("Outfit") << "desc different " << item1->getActualDescription() + LL_DEBUGS("Avatar") << "desc different " << item1->getActualDescription() << " " << item2->getActualDescription() << " names " << item1->getName() << " " << item2->getName() << LL_ENDL; } @@ -3373,9 +3357,7 @@ void LLAppearanceMgr::updateIsDirty() } } llassert(!mOutfitIsDirty); - // Change log tag for easier debugging - //LL_DEBUGS("Avatar") << "clean" << LL_ENDL; - LL_DEBUGS("Outfit") << "clean" << LL_ENDL; + LL_DEBUGS("Avatar") << "clean" << LL_ENDL; } // *HACK: Must match name in Library or agent inventory @@ -4442,10 +4424,7 @@ bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_b //to cause appearance of the agent to be updated bool result = false; - // Compiler appeasement by Cinder Roxley - //if (result = gAgentWearables.moveWearable(item, closer_to_body)) if ((result = gAgentWearables.moveWearable(item, closer_to_body))) - // { // [Legacy Bake] //gAgentAvatarp->wearableUpdated(item->getWearableType()); @@ -4812,4 +4791,3 @@ public: }; LLWearFolderHandler gWearFolderHandler; - diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 52a0bf6751..a238da0da1 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -278,7 +278,6 @@ private: static void onOutfitRename(const LLSD& notification, const LLSD& response); - bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls.