From 1bd52dfbdc3607bbd9ea86c715ce63b17d5a557f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 2 Jul 2012 17:57:29 -0700
Subject: CHUI-101 WIP Make LLFolderView general purpose refactored source
 files, moving logic into llfolderviewmodel*.cpp filter logic tweaks purging
 and moving inventory now properly cleans up view model

---
 indra/newview/llfolderviewitem.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llfolderviewitem.h')

diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index a3c92a55e8..581ec7239e 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -92,13 +92,12 @@ protected:
 	S32							mLabelWidth;
 	bool						mLabelWidthDirty;
 	LLFolderViewFolder*			mParentFolder;
-	LLFolderViewModelItem*		mListener;
+	LLFolderViewModelItem*		mViewModelItem;
 	BOOL						mIsCurSelection;
 	BOOL						mSelectPending;
 	LLFontGL::StyleFlags		mLabelStyle;
 	std::string					mLabelSuffix;
 	LLUIImagePtr				mIcon;
-	std::string					mStatusText;
 	LLUIImagePtr				mIconOpen;
 	LLUIImagePtr				mIconOverlay;
 	BOOL						mHasVisibleChildren;
@@ -136,9 +135,6 @@ public:
 	virtual S32 arrange( S32* width, S32* height );
 	virtual S32 getItemHeight();
 
-	// updates filter serial number and optionally propagated value up to root
-	S32		getLastFilterGeneration() const;
-
 	// If 'selection' is 'this' then note that otherwise ignore.
 	// Returns TRUE if this item ends up being selected.
 	virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus);
@@ -202,8 +198,8 @@ public:
 	LLFolderViewItem* getNextOpenNode( BOOL include_children = TRUE );
 	LLFolderViewItem* getPreviousOpenNode( BOOL include_children = TRUE );
 
-	const LLFolderViewModelItem* getViewModelItem( void ) const { return mListener; }
-	LLFolderViewModelItem* getViewModelItem( void ) { return mListener; }
+	const LLFolderViewModelItem* getViewModelItem( void ) const { return mViewModelItem; }
+	LLFolderViewModelItem* getViewModelItem( void ) { return mViewModelItem; }
 
 	const LLFolderViewModelInterface* getFolderViewModel( void ) const;
 	LLFolderViewModelInterface* getFolderViewModel( void );
-- 
cgit v1.2.3