summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-23 17:50:15 -0800
committerRichard Linden <none@none>2012-01-23 17:50:15 -0800
commitff5fe4ffc06fa9220043d82a2d7d7dbc0b7ffd77 (patch)
treef6b31777ceb1a66c81aa7322687a9068fbd6a3b9 /indra/newview/llfolderviewitem.cpp
parentea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff)
parente09661f6ec467ea98715a2a04db40fc4e6b7ce02 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
-rw-r--r--indra/newview/llfolderviewitem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 8d6114c887..9944a9dd3d 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -423,7 +423,7 @@ S32 LLFolderViewItem::arrange( S32* width, S32* height, S32 filter_generation)
: 0;
if (mLabelWidthDirty)
{
- mLabelWidth = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + getLabelFontForStyle(mLabelStyle)->getWidth(mSearchableLabel);
+ mLabelWidth = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + getLabelFontForStyle(mLabelStyle)->getWidth(mLabel) + getLabelFontForStyle(mLabelStyle)->getWidth(mLabelSuffix);
mLabelWidthDirty = false;
}