livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Firestorm LGPL

meow-7.2.2
Ansariel 2019-11-28 17:04:58 +01:00
parent 55fed317ab bae5bc69fb
commit d6f55d9047
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
indra/newview/llinventorymodel.cpp
View File

@ -1010,20 +1010,42 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask)
LLUUID new_parent_id = item->getParentUUID();
bool update_parent_on_server = false;
// <FS:Ansariel> Fix attachments being to Lost&Found during logout
// <FS:Ansariel> 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())
// </FS:Ansariel>
{
// 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;
}
}
// </FS:Ansariel>
if(old_parent_id != new_parent_id)
{

3
indra/newview/llvoavatar.cpp
View File

@ -3696,6 +3696,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// <FS:Ansariel> 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()))))
@ -3719,7 +3720,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());
}
}
// </FS:Ansariel>