diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-20 21:49:27 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-20 21:49:27 +0000 |
| commit | b05a2dc76acc6c1ca4bfc09de37326027dbf038d (patch) | |
| tree | d0b49adb34e8e163a799d83978fce8bead92d1af /indra/newview/llfolderview.cpp | |
| parent | ea8c0d2d7113376efe32e1d9b71c4b03b2ad803f (diff) | |
| parent | f62821fadd50333c367dc5c8de2929273842f9b0 (diff) | |
merge from viewer2
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 68faaeaa0b..7d527fa98a 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -419,6 +419,11 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen S32 total_width = LEFT_PAD; S32 running_height = mDebugFilters ? llceil(LLFontGL::getFontMonospace()->getLineHeight()) : 0; S32 target_height = running_height; + if(!mHasVisibleChildren)// is there any filtered items ? + { + //Nope. We need to display status textbox, let's reserve some place for it + target_height += mStatusTextBox->getTextPixelHeight(); + } S32 parent_item_height = getRect().getHeight(); for (folders_t::iterator iter = mFolders.begin(); |