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

Fix folder name localization for MAINT-6959

meow-7.2.2
Ansariel 2017-02-03 22:21:33 +01:00
parent 9760989fda
commit 04defa0670
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llfloaterpreference.cpp
View File

@ -3244,11 +3244,27 @@ std::string get_category_path(LLUUID cat_id)
LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
if (cat->getParentUUID().notNull())
{
return get_category_path(cat->getParentUUID()) + " > " + cat->getName();
// <FS:Ansariel> Fix folder name localization
//return get_category_path(cat->getParentUUID()) + " > " + cat->getName();
std::string localized_name;
if (!LLTrans::findString(localized_name, "InvFolder " + cat->getName()))
{
localized_name = cat->getName();
}
return get_category_path(cat->getParentUUID()) + " > " + localized_name;
// </FS:Ansariel>
}
else
{
return cat->getName();
// <FS:Ansariel> Fix folder name localization
//return cat->getName();
std::string localized_name;
if (!LLTrans::findString(localized_name, "InvFolder " + cat->getName()))
{
localized_name = cat->getName();
}
return localized_name;
// </FS:Ansariel>
}
}