1 files changed, 46 insertions, 29 deletions

diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 5e6902d..9fad72e 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -168,6 +168,10 @@ public:
 class LLInventoryFilter
 {
 public:
+        //fix to get rid of gSavedSettings use - rkeast
+        void setSearchType(U32 type);
+        U32      getSearchType();
+
         typedef enum e_folder_show
         {
                 SHOW_ALL_FOLDERS,
@@ -248,6 +252,9 @@ public:
         void fromLLSD(LLSD& data);
 
 protected:
+        //fix to get rid of gSavedSettings use - rkeast
+        U32                             mSearchType;
+
         struct filter_ops
         {
                 U32                     mFilterTypes;
@@ -322,9 +329,12 @@ class LLFolderView;
 
 class LLFolderViewItem : public LLUICtrl
 {
-protected:
         friend class LLFolderViewEventListener;
 
+private:
+        BOOL                                    mIsSelected;
+
+protected:
         static const LLFontGL*          sFont;
         static const LLFontGL*          sSmallFont;
         static LLColor4                         sFgColor;
@@ -354,7 +364,6 @@ protected:
         U32                                                     mCreationDate;
         LLFolderViewFolder*                     mParentFolder;
         LLFolderViewEventListener*      mListener;
-        BOOL                                            mIsSelected;
         BOOL                                            mIsCurSelection;
         BOOL                                            mSelectPending;
         LLFontGL::StyleFlags            mLabelStyle;
@@ -363,7 +372,6 @@ protected:
         std::string                                     mStatusText;
         BOOL                                            mHasVisibleChildren;
         S32                                                     mIndentation;
-        S32                                                     mNumDescendantsSelected;
         BOOL                                            mFiltered;
         S32                                                     mLastFilterGeneration;
         std::string::size_type          mStringMatchOffset;
@@ -424,22 +432,23 @@ public:
 
         virtual void    dirtyFilter();
 
-        // If the selection is 'this' then note that otherwise
-        // ignore. Returns TRUE if this object was affected. If open is
-        // TRUE, then folders are opened up along the way to the
-        // selection.
-        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
-                BOOL take_keyboard_focus);
+        // 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);
 
-        // This method is used to toggle the selection of an item. If
-        // selection is 'this', then note selection, and return TRUE.
+        // This method is used to set the selection state of an item.
+        // If 'selection' is 'this' then note selection.
+        // Returns TRUE if the selection state of this item was changed.
         virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
 
         // this method is used to group select items
-        virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items){ return FALSE; }
+        virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items) { }
 
-        // this method is used to group select items
-        virtual void recursiveDeselect(BOOL deselect_self);
+        // this method is used to deselect this element
+        void deselectItem();
+
+        // this method is used to select this element
+        void selectItem();
 
         // gets multiple-element selection
         virtual BOOL getSelectionList(std::set<LLUUID> &selection){return TRUE;}
@@ -453,9 +462,7 @@ public:
         // destroys this item recursively
         virtual void destroyView();
 
-        S32 getNumSelectedDescendants() { return mNumDescendantsSelected; }
-
-        BOOL isSelected() { return mIsSelected; }
+        BOOL isSelected() const { return mIsSelected; }
 
         void setIsCurSelection(BOOL select) { mIsCurSelection = select; }
 
@@ -475,7 +482,7 @@ public:
         // viewed. This method will ask the viewed object itself.
         const std::string& getName( void ) const;
 
-        const std::string& getSearchableLabel( U32 search_type ) const;
+        const std::string& getSearchableLabel() const;
 
         // This method returns the label displayed on the view. This
         // method was primarily added to allow sorting on the folder
@@ -563,6 +570,13 @@ public:
                 UNKNOWN, TRASH, NOT_TRASH
         } ETrash;
 
+private:
+        S32             mNumDescendantsSelected;
+
+public: // Accessed needed by LLFolderViewItem
+        void recursiveIncrementNumDescendantsSelected(S32 increment);
+        S32 numSelected(void) const { return mNumDescendantsSelected + (isSelected() ? 1 : 0); }
+
 protected:
         typedef std::list<LLFolderViewItem*> items_t;
         typedef std::list<LLFolderViewFolder*> folders_t;
@@ -624,20 +638,22 @@ public:
         virtual void dirtyFilter();
 
         // Passes selection information on to children and record
-        // selection information if necessary. Returns TRUE if this object
-        // (or a child) was affected.
-        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
-                                                          BOOL take_keyboard_focus);
-
-        // This method is used to change the selection of an item. If
-        // selection is 'this', then note selection as true. Returns TRUE
-        // if this or a child is now selected.
+        // selection information if necessary.
+        // Returns TRUE if this object (or a child) ends up being selected.
+        // If 'openitem' is TRUE then folders are opened up along the way to the selection.
+        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus);
+
+        // This method is used to change the selection of an item.
+        // Recursively traverse all children; if 'selection' is 'this' then change
+        // the select status if necessary.
+        // Returns TRUE if the selection state of this folder, or of a child, was changed.
         virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
 
         // this method is used to group select items
-        virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
+        virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
 
-        virtual void recursiveDeselect(BOOL deselect_self);
+        // Deselect this folder and all folder/items it contains recursively.
+        void recursiveDeselect(BOOL deselect_self);
 
         // Returns true is this object and all of its children can be removed.
         virtual BOOL isRemovable();
@@ -724,6 +740,7 @@ public:
 
         time_t getCreationDate() const;
         bool isTrash() const;
+        S32 getNumSelectedDescendants(void) const { return mNumDescendantsSelected; }
 };
 
 
@@ -797,7 +814,7 @@ public:
         // children, and keeps track of selected objects.
         virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
 
-        virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
+        virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
 
         virtual BOOL getSelectionList(std::set<LLUUID> &selection);