diff options
| author | Richard Linden <none@none> | 2012-07-02 17:57:29 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-02 17:57:29 -0700 |
| commit | 1bd52dfbdc3607bbd9ea86c715ce63b17d5a557f (patch) | |
| tree | 6fffd9003c6c9f9a6421603f3552082ec7f12e4a /indra/newview/lltexturectrl.cpp | |
| parent | 062cae9a4880f7672df7f6189e01b2bff15f42f1 (diff) | |
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
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 61a0331b72..4a9e106687 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -623,9 +623,9 @@ void LLFloaterTexturePicker::draw() LLFolderView* folder_view = mInventoryPanel->getRootFolder(); if (!folder_view) return; - LLInventoryFilter* filter = static_cast<LLFolderViewModelInventory*>(folder_view->getFolderViewModel())->getFilter(); + LLFolderViewFilter* filter = static_cast<LLFolderViewModelInventory*>(folder_view->getFolderViewModel())->getFilter(); - bool is_filter_active = folder_view->getLastFilterGeneration() < filter->getCurrentGeneration() && + bool is_filter_active = folder_view->getViewModelItem()->getLastFilterGeneration() < filter->getCurrentGeneration() && filter->isNotDefault(); // After inventory panel filter is applied we have to update |