summaryrefslogtreecommitdiff
path: root/indra/llui/llfolderview.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-04-11 19:02:16 -0700
committerMerov Linden <merov@lindenlab.com>2013-04-11 19:02:16 -0700
commitb05bf882dbf5cdcb4683b4c6201ea50a38491a7b (patch)
tree233f0aaead89eec311c888a350bc1a9ff3e79481 /indra/llui/llfolderview.cpp
parent21d7c1d0ba7fa548e5ea88010bb72e47656a53f5 (diff)
CHUI-912 : WIP : Fix resize test when folder is empty, add more traces (to be deleted)
Diffstat (limited to 'indra/llui/llfolderview.cpp')
-rw-r--r--indra/llui/llfolderview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index c6868c9538..5bca589bc4 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -662,7 +662,7 @@ void LLFolderView::draw()
// get preferable text height...
S32 pixel_height = mStatusTextBox->getTextPixelHeight();
- bool height_changed = local_rect.getHeight() != pixel_height;
+ bool height_changed = (local_rect.getHeight() < pixel_height);
if (height_changed)
{
// ... if it does not match current height, lets rearrange current view.
@@ -1616,7 +1616,7 @@ void LLFolderView::update()
{
getFolderViewModel()->getFilter().clearModified();
}
- llinfos << "Merov : LLFolderView::update: modified = " << getFolderViewModel()->getFilter().isModified() << ", default = " << getFolderViewModel()->getFilter().isNotDefault() << ", count = " << getFolderViewModel()->getFilter().getFilterCount() << llendl;
+ llinfos << "Merov : LLFolderView::update: parent = " << mParentPanel->getName() << ", modified = " << getFolderViewModel()->getFilter().isModified() << ", not default = " << getFolderViewModel()->getFilter().isNotDefault() << ", count = " << getFolderViewModel()->getFilter().getFilterCount() << llendl;
// automatically show matching items, and select first one if we had a selection
if (mNeedsAutoSelect)