From 015db564cff18fa58fa677b48ef7a7048c444fb4 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 20 Jun 2011 11:00:02 -0700
Subject: EXP-915 FIX remove mHidden and mStartFolderID from LLFolderView*
 removed mHidden variable

---
 indra/newview/llfolderviewitem.cpp | 7 +------
 indra/newview/llfolderviewitem.h   | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 904c233850..5f1d32ee5a 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -130,7 +130,6 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
 	mIconOpen(p.icon_open),
 	mIconOverlay(p.icon_overlay),
 	mListener(p.listener),
-	mHidden(false),
 	mShowLoadStatus(false)
 {
 }
@@ -1058,7 +1057,7 @@ void LLFolderViewItem::draw()
 		&&	mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime"))
 			||	(LLInventoryModelBackgroundFetch::instance().backgroundFetchActive()
 				&&	root_is_loading
-				&&	(mShowLoadStatus || mHidden)))
+				&&	mShowLoadStatus))
 	{
 		std::string load_string = " ( " + LLTrans::getString("LoadingData") + " ) ";
 		font->renderUTF8(load_string, 0, right_x, y, sSearchStatusColor,
@@ -1368,10 +1367,6 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter)
 			// and then item rules
 			LLFolderViewItem::filter( filter );
 		}
-		if (mHidden)
-		{
-			setOpen();
-		}
 	}
 
 	if (getRoot()->getDebugFilters())
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index c48e568b30..7d640adf2e 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -157,7 +157,6 @@ protected:
 	BOOL						mDragAndDropTarget;
 	BOOL                        mIsLoading;
 	LLTimer                     mTimeSinceRequestStart;
-	bool						mHidden;
 	bool						mShowLoadStatus;
 
 	// helper function to change the selection from the root.
-- 
cgit v1.2.3