From c93c38e047836e31dd34e33391a997d883777ae1 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 21 Mar 2007 19:36:11 +0000
Subject: svn merge -r 59178:59364
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/llfolderview.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llfolderview.cpp')

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()
-- 
cgit v1.2.3