diff options
| author | Richard Linden <none@none> | 2010-06-15 10:25:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-15 10:25:47 -0700 |
| commit | a37e6ce52eb8c0ed6c433a4d2b23647c590f8312 (patch) | |
| tree | 14743f7ece3badf8cce0695afdf4234f1a23f67a /indra/newview/llfolderview.cpp | |
| parent | da078d9a35e256a59652f6ed545b3cb09f384bb0 (diff) | |
| parent | 809fea74633bcb3358eed9f80059822c6664bf54 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 74034cfbf7..f241d18a21 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -185,6 +185,7 @@ LLFolderView::LLFolderView(const Params& p) mRenameItem( NULL ), mNeedsScroll( FALSE ), mEnableScroll( true ), + mUseLabelSuffix(p.use_label_suffix), mPinningSelectedItem(FALSE), mNeedsAutoSelect( FALSE ), mAutoSelectOverride(FALSE), @@ -961,7 +962,7 @@ void LLFolderView::draw() } mStatusTextBox->setValue(mStatusText); mStatusTextBox->setVisible( TRUE ); - + // firstly reshape message textbox with current size. This is necessary to // LLTextBox::getTextPixelHeight works properly const LLRect local_rect = getLocalRect(); |