diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-15 17:12:22 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-15 17:12:22 -0400 |
| commit | d2d95e96456d7810b6ab5051ed6f68395dfc917e (patch) | |
| tree | b9b3a7eacc72008c765894127a3eb27c34498a6e /indra/newview/llfolderviewitem.cpp | |
| parent | 0be5ce0a595ee582ee2bb7a0091e0424f908ddea (diff) | |
| parent | 050199e031b9959de09669619ea0970ede118a98 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 0c437cf035..50b35bfc69 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -289,8 +289,11 @@ void LLFolderViewItem::refreshFromListener() mCreationDate = mListener->getCreationDate(); dirtyFilter(); } - mLabelStyle = mListener->getLabelStyle(); - mLabelSuffix = mListener->getLabelSuffix(); + if (mRoot->useLabelSuffix()) + { + mLabelStyle = mListener->getLabelStyle(); + mLabelSuffix = mListener->getLabelSuffix(); + } } } |