From 2ee1d1b93af51e10b867396309edd3f9b1e4b42f Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <ansarielhiller@yahoo.de>
Date: Fri, 3 Feb 2017 21:28:36 +0000
Subject: MAINT-6959: Use localized category names

---
 indra/newview/llfloaterpreference.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 30dfff4ac8..df4bc043e5 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1993,13 +1993,19 @@ void LLFloaterPreference::onChangeMaturity()
 std::string get_category_path(LLUUID cat_id)
 {
     LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
+    std::string localized_cat_name;
+    if (!LLTrans::findString(localized_cat_name, "InvFolder " + cat->getName()))
+    {
+        localized_cat_name = cat->getName();
+    }
+
     if (cat->getParentUUID().notNull())
     {
-        return get_category_path(cat->getParentUUID()) + " > " + cat->getName();
+        return get_category_path(cat->getParentUUID()) + " > " + localized_cat_name;
     }
     else
     {
-        return cat->getName();
+        return localized_cat_name;
     }
 }
 
-- 
cgit v1.2.3


From 07cc16f4796e571eb804866493e87d777bdead46 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 6 Feb 2017 17:29:45 +0200
Subject: MAINT-2001 Fixes colums misbeheaving

---
 indra/llui/llscrolllistctrl.cpp                        |  4 ++--
 indra/newview/skins/default/xui/en/floater_inspect.xml | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 1190c5bb94..db8fdc46b7 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -648,7 +648,7 @@ bool LLScrollListCtrl::updateColumnWidths()
 		S32 new_width = 0;
 		if (column->mRelWidth >= 0)
 		{
-			new_width = (S32)ll_round(column->mRelWidth * (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding));
+			new_width = (S32)ll_round(column->mRelWidth*mItemListRect.getWidth());
 		}
 		else if (column->mDynamicWidth)
 		{
@@ -2680,7 +2680,7 @@ void LLScrollListCtrl::addColumn(const LLScrollListColumn::Params& column_params
 			}
 			if (new_column->mRelWidth >= 0)
 			{
-				new_column->setWidth((S32)ll_round(new_column->mRelWidth * (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding)));
+				new_column->setWidth((S32)ll_round(new_column->mRelWidth*mItemListRect.getWidth()));
 			}
 			else if(new_column->mDynamicWidth)
 			{
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index ae46736ddf..63334e2b24 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -27,21 +27,21 @@
      tool_tip="Select an object from this list to highlight it in-world"
      top="20">
         <scroll_list.columns
-         relative_width="0.32"
+         relative_width="0.25"
          label="Object Name"
          name="object_name" />
         <scroll_list.columns
-         relative_width="0.34"
+         relative_width="0.25"
          label="Owner Name"
          name="owner_name" />
         <scroll_list.columns
-         relative_width="0.34"
+         relative_width="0.25"
          label="Creator Name"
          name="creator_name" />
         <scroll_list.columns
+         relative_width="0.25"
          label="Creation Date"
-         name="creation_date"
-         width="150" />
+         name="creation_date" />
 		 <scroll_list.commit_callback
 		   function="Inspect.SelectObject" />
     </scroll_list>
-- 
cgit v1.2.3