diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-09-27 13:04:12 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-09-27 13:04:12 +0300 |
| commit | 892d3a9bf870bd4af802a8cd742130649c627cf2 (patch) | |
| tree | cf13c94a613e0c567fbe0ed7ad0e075b4c3877bd /indra/newview/llinventorymodel.h | |
| parent | 3f970601339fa34937454fd83820ffb1c7d6b295 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llinventorymodel.h')
| -rw-r--r-- | indra/newview/llinventorymodel.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 576c5e9e20..a4326aaeed 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -316,9 +316,7 @@ public: // Copy content of all folders of type "type" into folder "id" and delete/purge the empty folders // Note : This method has been designed for FT_OUTBOX (aka Merchant Outbox) but can be used for other categories void consolidateForType(const LLUUID& id, LLFolderType::EType type); - - bool isCategoryHidden(const LLUUID& id) const; - + private: mutable LLPointer<LLViewerInventoryItem> mLastItem; // cache recent lookups @@ -615,6 +613,7 @@ protected: static bool loadFromFile(const std::string& filename, cat_array_t& categories, item_array_t& items, + changed_items_t& cats_to_update, bool& is_cache_obsolete); static bool saveToFile(const std::string& filename, const cat_array_t& categories, |