Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final

1 files changed, 27 insertions, 8 deletions

diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index e376fe4c32..702d9a55ab 100644
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -390,25 +390,44 @@ std::string LLPanelLandmarkInfo::getFullFolderName(const LLViewerInventoryCatego
 	if (cat)
 	{
 		name = cat->getName();
-
-		// translate category name, if it's right below the root
-		// FIXME: it can throw notification about non existent string in strings.xml
-		if (cat->getParentUUID().notNull() && cat->getParentUUID() == gInventory.getRootFolderID())
-		{
-			LLTrans::findString(name, "InvFolder " + name);
-		}
+		parent_id = cat->getParentUUID();
+		bool is_under_root_category = parent_id == gInventory.getRootFolderID();
 
 		// we don't want "My Inventory" to appear in the name
-		while ((parent_id = cat->getParentUUID()).notNull() && parent_id != gInventory.getRootFolderID())
+		while ((parent_id = cat->getParentUUID()).notNull())
 		{
 			cat = gInventory.getCategory(parent_id);
 			llassert(cat);
 			if (cat)
 			{
+				if (is_under_root_category || cat->getParentUUID() == gInventory.getRootFolderID())
+				{
+					std::string localized_name;
+					if (is_under_root_category)
+					{
+		// translate category name, if it's right below the root
+		// FIXME: it can throw notification about non existent string in strings.xml
+						bool is_found = LLTrans::findString(localized_name, "InvFolder " + name);
+						name = is_found ? localized_name : name;
+					}
+					else
+		{
+						// FIXME: it can throw notification about non existent string in strings.xml
+						bool is_found = LLTrans::findString(localized_name, "InvFolder " + cat->getName());
+
+						// add translated category name to folder's full name
+						name = (is_found ? localized_name : cat->getName()) + "/" + name;
+		}
+
+					break;
+				}
+				else
+			{
 				name = cat->getName() + "/" + name;
 			}
 		}
 	}
+	}
 
 	return name;
 }