diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-02-10 19:56:52 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-02-10 19:56:52 +0200 |
| commit | a96889d651c470cab897517065d5f41d362416f6 (patch) | |
| tree | d99b284029a3e55c48a7c36e80ea9cc703424bbe /indra/newview | |
| parent | 451595dc381f8c06bd67ffd06f9018aa9ddd253b (diff) | |
| parent | 07cc16f4796e571eb804866493e87d777bdead46 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_inspect.xml | 10 |
2 files changed, 13 insertions, 7 deletions
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; } } 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> |