diff options
author | Jacek Antonelli | 2008-08-15 23:44:52 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:52 -0500 |
commit | 0340e6d3dea28e7bb1da9dc67ac4c2b57354279f (patch) | |
tree | df9029fa98b28a23c44409598764f282c14c4e16 /linden/indra/newview/llinventoryview.cpp | |
parent | Second Life viewer sources 1.14.0.0 (diff) | |
download | meta-impy-0340e6d3dea28e7bb1da9dc67ac4c2b57354279f.zip meta-impy-0340e6d3dea28e7bb1da9dc67ac4c2b57354279f.tar.gz meta-impy-0340e6d3dea28e7bb1da9dc67ac4c2b57354279f.tar.bz2 meta-impy-0340e6d3dea28e7bb1da9dc67ac4c2b57354279f.tar.xz |
Second Life viewer sources 1.14.0.1
Diffstat (limited to 'linden/indra/newview/llinventoryview.cpp')
-rw-r--r-- | linden/indra/newview/llinventoryview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index afeb3be..162cf9f 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp | |||
@@ -622,7 +622,7 @@ void LLInventoryView::onClose(bool app_quitting) | |||
622 | gSavedSettings.setBOOL("ShowInventory", FALSE); | 622 | gSavedSettings.setBOOL("ShowInventory", FALSE); |
623 | } | 623 | } |
624 | // clear filters, but save user's folder state first | 624 | // clear filters, but save user's folder state first |
625 | if (!mActivePanel->getRootFolder()->isFilterActive()) | 625 | if (!mActivePanel->getRootFolder()->isFilterModified()) |
626 | { | 626 | { |
627 | mSavedFolderState->setApply(FALSE); | 627 | mSavedFolderState->setApply(FALSE); |
628 | mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState); | 628 | mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState); |
@@ -868,7 +868,7 @@ void LLInventoryView::onSearchEdit(const LLString& search_string, void* user_dat | |||
868 | } | 868 | } |
869 | 869 | ||
870 | // save current folder open state if no filter currently applied | 870 | // save current folder open state if no filter currently applied |
871 | if (!self->mActivePanel->getRootFolder()->isFilterActive()) | 871 | if (!self->mActivePanel->getRootFolder()->isFilterModified()) |
872 | { | 872 | { |
873 | self->mSavedFolderState->setApply(FALSE); | 873 | self->mSavedFolderState->setApply(FALSE); |
874 | self->mActivePanel->getRootFolder()->applyFunctorRecursively(*self->mSavedFolderState); | 874 | self->mActivePanel->getRootFolder()->applyFunctorRecursively(*self->mSavedFolderState); |