diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-17 07:42:08 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-17 07:42:08 -0700 |
| commit | 74817f151f3e5c2c0c179d13d1100974ed78fbd4 (patch) | |
| tree | b198a5df57d362bfbd6c0617d14f5f7803ee5d6d /indra/newview/llfolderviewitem.cpp | |
| parent | 1c15d18175782f5afee9377af3f0b4ca9e2a4db8 (diff) | |
| parent | 7cc006347822a70f36175dc2627814a0eaeb9c0a (diff) | |
Merged from q/viewer-release
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(); + } } } |