diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 37c76b2fbf..cad076a3f1 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -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(); + // 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; + // } else { - return cat->getName(); + // 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; + // } }