1 files changed, 23 insertions, 6 deletions

diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index 38c44da..78fa362 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -126,11 +126,6 @@ public:
 
         void unSelectAll()      { mFolders->setSelection(NULL, FALSE, FALSE); }
 
-        BOOL getNeedsAutoSelect() { return mNeedsAutoSelect; }
-        void setNeedsAutoSelect(BOOL val) { mNeedsAutoSelect = val; }
-
-        void setAutoSelectOverride(bool override) { mFolders->setAutoSelectOverride(override); }
-
 protected:
         // Given the id and the parent, build all of the folder views.
         void rebuildViewsFor(const LLUUID& id, U32 mask);
@@ -155,7 +150,6 @@ protected:
         BOOL                                            mAllowMultiSelect;
         const LLString                          mSortOrderSetting;
         LLFolderSearchFunction          mSearchFunction;
-        BOOL                                            mNeedsAutoSelect;
 };
 
 class LLInventoryView;
@@ -292,6 +286,29 @@ public:
         virtual void doItem(LLFolderViewItem* item);
 };
 
+class LLSaveFolderState : public LLFolderViewFunctor
+{
+public:
+        LLSaveFolderState() : mApply(FALSE) {}
+        virtual ~LLSaveFolderState() {}
+        virtual void doFolder(LLFolderViewFolder* folder);
+        virtual void doItem(LLFolderViewItem* item) {}
+        void setApply(BOOL apply);
+        void clearOpenFolders() { mOpenFolders.clear(); }
+protected:
+        std::set<LLUUID> mOpenFolders;
+        BOOL mApply;
+};
+
+class LLOpenFoldersWithSelection : public LLFolderViewFunctor
+{
+public:
+        LLOpenFoldersWithSelection() {}
+        virtual ~LLOpenFoldersWithSelection() {}
+        virtual void doFolder(LLFolderViewFolder* folder);
+        virtual void doItem(LLFolderViewItem* item);
+};
+
 ///----------------------------------------------------------------------------
 /// Function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------