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

Merged in lindenlab/viewer-bear

meow-7.2.2
AndreyL ProductEngine 2017-02-10 19:56:52 +02:00
parent 451595dc38 07cc16f479
commit a96889d651
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llscrolllistctrl.cpp
View File

@ -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)
{

10
indra/newview/llfloaterpreference.cpp
View File

@ -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;
}
}

10
indra/newview/skins/default/xui/en/floater_inspect.xml
View File

@ -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>