1 files changed, 31 insertions, 61 deletions

diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 431f212..377e620 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -327,10 +327,10 @@ void LLFolderViewItem::arrangeFromRoot()
 // UI. If open is TRUE, then folders are opened up along the way to
 // the selection.
 void LLFolderViewItem::setSelectionFromRoot(LLFolderViewItem* selection,
-                                                                                        BOOL open,
+                                                                                        BOOL open,                                      /* Flawfinder: ignore */
                                                                                         BOOL take_keyboard_focus)
 {
-        getRoot()->setSelection(selection, open, take_keyboard_focus);
+        getRoot()->setSelection(selection, open, take_keyboard_focus);          /* Flawfinder: ignore */
 }
 
 // helper function to change the selection from the root.
@@ -534,7 +534,7 @@ void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
         }
 }
 
-void LLFolderViewItem::open( void )
+void LLFolderViewItem::open( void )             /* Flawfinder: ignore */
 {
         if( mListener )
         {
@@ -1365,7 +1365,7 @@ BOOL LLFolderViewFolder::hasFilteredDescendants()
 
 // Passes selection information on to children and record selection
 // information if necessary.
-BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,
+BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,           /* Flawfinder: ignore */
                                                                           BOOL take_keyboard_focus)
 {
         BOOL rv = FALSE;
@@ -1389,7 +1389,7 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,
                  iter != mFolders.end();)
         {
                 folders_t::iterator fit = iter++;
-                if((*fit)->setSelection(selection, open, take_keyboard_focus))
+                if((*fit)->setSelection(selection, open, take_keyboard_focus))          /* Flawfinder: ignore */
                 {
                         rv = TRUE;
                         child_selected = TRUE;
@@ -1400,14 +1400,14 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,
                  iter != mItems.end();)
         {
                 items_t::iterator iit = iter++;
-                if((*iit)->setSelection(selection, open, take_keyboard_focus))
+                if((*iit)->setSelection(selection, open, take_keyboard_focus))          /* Flawfinder: ignore */
                 {
                         rv = TRUE;
                         child_selected = TRUE;
                         mNumDescendantsSelected++;
                 }
         }
-        if(open && child_selected)
+        if(open && child_selected)              /* Flawfinder: ignore */
         {
                 setOpenArrangeRecursively(TRUE);
         }
@@ -1964,16 +1964,16 @@ void LLFolderViewFolder::toggleOpen()
 }
 
 // Force a folder open or closed
-void LLFolderViewFolder::setOpen(BOOL open)
+void LLFolderViewFolder::setOpen(BOOL open)             /* Flawfinder: ignore */
 {
-        setOpenArrangeRecursively(open);
+        setOpenArrangeRecursively(open);                /* Flawfinder: ignore */
 }
 
-void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)
+void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)             /* Flawfinder: ignore */
 {
         BOOL was_open = mIsOpen;
-        mIsOpen = open;
-        if(!was_open && open)
+        mIsOpen = open;         /* Flawfinder: ignore */
+        if(!was_open && open)           /* Flawfinder: ignore */
         {
                 if(mListener)
                 {
@@ -1986,12 +1986,12 @@ void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recur
                          iter != mFolders.end();)
                 {
                         folders_t::iterator fit = iter++;
-                        (*fit)->setOpenArrangeRecursively(open, RECURSE_DOWN);
+                        (*fit)->setOpenArrangeRecursively(open, RECURSE_DOWN);          /* Flawfinder: ignore */
                 }
         }
         if (mParentFolder && (recurse == RECURSE_UP || recurse == RECURSE_UP_DOWN))
         {
-                mParentFolder->setOpenArrangeRecursively(open, RECURSE_UP);
+                mParentFolder->setOpenArrangeRecursively(open, RECURSE_UP);             /* Flawfinder: ignore */
         }
         
         if (was_open != mIsOpen)
@@ -2024,7 +2024,7 @@ BOOL LLFolderViewFolder::handleDragAndDropFromChild(MASK mask,
         return TRUE;
 }
 
-void LLFolderViewFolder::open( void )
+void LLFolderViewFolder::open( void )           /* Flawfinder: ignore */
 {
         toggleOpen();
 }
@@ -2713,10 +2713,10 @@ void LLFolderView::openFolder(const LLString& foldername)
         }
 }
 
-void LLFolderView::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)
+void LLFolderView::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)           /* Flawfinder: ignore */
 {
         // call base class to do proper recursion
-        LLFolderViewFolder::setOpenArrangeRecursively(open, recurse);
+        LLFolderViewFolder::setOpenArrangeRecursively(open, recurse);           /* Flawfinder: ignore */
         // make sure root folder is always open
         mIsOpen = TRUE;
 }
@@ -2892,7 +2892,7 @@ LLFolderViewItem* LLFolderView::getCurSelectedItem( void )
 
 
 // Record the selected item and pass it down the hierachy.
-BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,
+BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,         /* Flawfinder: ignore */
                                                                 BOOL take_keyboard_focus)
 {
         if( selection == this )
@@ -2914,8 +2914,8 @@ BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,
                 addToSelectionList(selection);
         }
 
-        BOOL rv = LLFolderViewFolder::setSelection(selection, open, take_keyboard_focus);
-        if(open)
+        BOOL rv = LLFolderViewFolder::setSelection(selection, open, take_keyboard_focus);               /* Flawfinder: ignore */
+        if(open)                /* Flawfinder: ignore */
         {
                 selection->getParentFolder()->requestArrange();
         }
@@ -3331,7 +3331,7 @@ void LLFolderView::openSelectedItems( void )
         {
                 if (mSelectedItems.size() == 1)
                 {
-                        mSelectedItems.front()->open();
+                        mSelectedItems.front()->open();         /* Flawfinder: ignore */
                 }
                 else
                 {
@@ -3345,11 +3345,11 @@ void LLFolderView::openSelectedItems( void )
                         selected_items_t::iterator item_it;
                         for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
                         {
-                                (*item_it)->open();
+                                (*item_it)->open();             /* Flawfinder: ignore */
                         }
 
                         LLFloater::setFloaterHost(NULL);
-                        multi_previewp->open();
+                        multi_previewp->open();         /* Flawfinder: ignore */
                 }
         }
 }
@@ -3380,7 +3380,7 @@ void LLFolderView::propertiesSelectedItems( void )
                         }
 
                         LLFloater::setFloaterHost(NULL);
-                        multi_propertiesp->open();
+                        multi_propertiesp->open();              /* Flawfinder: ignore */
                 }
         }
 }
@@ -3858,34 +3858,8 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
                         search(getCurSelectedItem(), mSearchString.c_str(), FALSE);
                         handled = TRUE;
                 }
-                else if (mask & MASK_CONTROL && key == 'N')
-                {
-                        LLFolderViewItem* selection = getCurSelectedItem();
-                        if (selection)
-                        {
-                                selection = selection->getNextOpenNode();
-                        }
-                        search(selection, mSearchString.c_str(), FALSE);
-                        mSearchTimer.reset();
-                        handled = TRUE;
-                }
-                else if (mask & MASK_CONTROL && key == 'P')
-                {
-                        LLFolderViewItem* selection = getCurSelectedItem();
-                        if (selection)
-                        {
-                                selection = selection->getPreviousOpenNode();
-                        }
-                        search(selection, mSearchString.c_str(), TRUE);
-                        mSearchTimer.reset();
-                        handled = TRUE;
-                }
         }
 
-        if (handled)
-        {
-                gViewerWindow->requestFastFrame(this);
-        }
         return handled;
 }
 
@@ -3921,11 +3895,6 @@ BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_pare
                 handled = TRUE;
         }
 
-        if (handled)
-        {
-                gViewerWindow->requestFastFrame(this);
-        }
-
         return handled;
 }
 
@@ -4078,7 +4047,7 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
                 }
 
                 menu->arrange();
-                menu->updateParent(gMenuHolder);
+                menu->updateParent(LLMenuGL::sMenuContainer);
                 LLMenuGL::showPopup(this, menu, x, y);
         }
         else
@@ -4499,14 +4468,15 @@ std::string::size_type LLInventoryFilter::getStringMatchOffset() const
         return mSubStringMatchOffset;
 }
 
+// has user modified default filter params?
 BOOL LLInventoryFilter::isActive()
 {
-        return mFilterOps.mFilterTypes != 0xffffffff 
+        return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes 
                 || mFilterSubString.size() 
-                || mFilterOps.mPermissions != PERM_NONE 
-                || mFilterOps.mMinDate != 0 
-                || mFilterOps.mMaxDate != U32_MAX
-                || mFilterOps.mHoursAgo != 0;
+                || mFilterOps.mPermissions != mDefaultFilterOps.mPermissions
+                || mFilterOps.mMinDate != mDefaultFilterOps.mMinDate 
+                || mFilterOps.mMaxDate != mDefaultFilterOps.mMaxDate
+                || mFilterOps.mHoursAgo != mDefaultFilterOps.mHoursAgo;
 }
 
 BOOL LLInventoryFilter::isModified()