diff options
author | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
commit | c93c38e047836e31dd34e33391a997d883777ae1 (patch) | |
tree | ccb52c02f9a3bfeb76254e128abc250e7fd5a962 /indra/newview/llfolderview.cpp | |
parent | fceae96eb171be0396512e251aab311d4e3ef9cc (diff) |
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r-- | indra/newview/llfolderview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 5f37d756fe..e9fa4cc1dd 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2524,6 +2524,7 @@ LLFolderView::LLFolderView( const LLString& name, LLViewerImage* root_folder_ico mShowSingleSelection(FALSE), mArrangeGeneration(0), mSelectCallback(NULL), + mSelectionChanged(FALSE), mMinWidth(0), mDragAndDropThisFrame(FALSE) { @@ -4408,9 +4409,11 @@ LLInventoryFilter::LLInventoryFilter(const LLString& name) : mFilterGeneration = 0; mMustPassGeneration = S32_MAX; mMinRequiredGeneration = 0; + mFilterCount = 0; mNextFilterGeneration = mFilterGeneration + 1; mLastLogoff = gSavedPerAccountSettings.getU32("LastLogoff"); + mFilterBehavior = FILTER_NONE; } LLInventoryFilter::~LLInventoryFilter() |