From 3833f8864dcef0031bc5e1ab6646e635ae23b75e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 19 Nov 2019 23:54:57 +0100 Subject: [PATCH 1/2] Fix texture surface area not properly shown in nametag --- indra/newview/llvoavatar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 64bc0ba2a4..7fab6762cb 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3692,6 +3692,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) // Show ARW in nametag options (for Jelly Dolls) static const std::string complexity_label = LLTrans::getString("Nametag_Complexity_Label"); + static const std::string texture_area_label = LLTrans::getString("Nametag_Texture_Area_Label"); if (show_arw_tag && ((isSelf() && show_own_arw_tag) || (!isSelf() && (!show_too_complex_only_arw_tag || isTooComplex())))) @@ -3715,7 +3716,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) LLResMgr::getInstance()->getIntegerString(complexity_string, mAttachmentSurfaceArea); label_args["TEXTURE_AREA"] = complexity_string; - addNameTagLine(format_string(complexity_label, label_args), LLColor4::red, LLFontGL::NORMAL, LLFontGL::getFontSansSerifSmall()); + addNameTagLine(format_string(texture_area_label, label_args), LLColor4::red, LLFontGL::NORMAL, LLFontGL::getFontSansSerifSmall()); } } // From bae5bc69fbda3af5ddcb489bf566cdcd96619c9f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 24 Nov 2019 11:22:14 +0100 Subject: [PATCH 2/2] Let's see if this helps with attachments randomly ending up in L&F: If there is a previous folder ID, just move it back to where they came from --- indra/newview/llinventorymodel.cpp | 42 +++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 7131ec8a3b..355a997e78 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1010,20 +1010,42 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) LLUUID new_parent_id = item->getParentUUID(); bool update_parent_on_server = false; - // Fix attachments being to Lost&Found during logout + // Fix attachments falsely being moved to Lost&Found //if (new_parent_id.isNull()) + //{ + // // item with null parent will end in random location and then in Lost&Found, + // // either move to default folder as if it is new item or don't move at all + // LL_WARNS(LOG_INV) << "Update attempts to reparent item " << item->getUUID() + // << " to null folder. Moving to Lost&Found. Old item name: " << old_item->getName() + // << ". New name: " << item->getName() + // << "." << LL_ENDL; + // new_parent_id = findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND); + // update_parent_on_server = true; + //} if (new_parent_id.isNull() && !LLApp::isExiting()) - // { - // item with null parent will end in random location and then in Lost&Found, - // either move to default folder as if it is new item or don't move at all - LL_WARNS(LOG_INV) << "Update attempts to reparent item " << item->getUUID() - << " to null folder. Moving to Lost&Found. Old item name: " << old_item->getName() - << ". New name: " << item->getName() - << "." << LL_ENDL; - new_parent_id = findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND); - update_parent_on_server = true; + if (old_parent_id.isNull()) + { + // item with null parent will end in random location and then in Lost&Found, + // either move to default folder as if it is new item or don't move at all + LL_WARNS(LOG_INV) << "Update attempts to reparent item " << item->getUUID() + << " to null folder. Moving to Lost&Found. Old item name: " << old_item->getName() + << ". New name: " << item->getName() + << "." << LL_ENDL; + new_parent_id = findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND); + update_parent_on_server = true; + } + else + { + LL_WARNS(LOG_INV) << "Update attempts to reparent item " << item->getUUID() + << " to null folder. Old parent not null. Moving to old parent. Old item name: " << old_item->getName() + << ". New name: " << item->getName() + << "." << LL_ENDL; + new_parent_id = old_parent_id; + update_parent_on_server = true; + } } + // if(old_parent_id != new_parent_id) {