From e37c30d5cd247d4dcefa1cf8e9e83fa8d8c25470 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Wed, 18 Jul 2018 19:59:31 +0300 Subject: Backed out changeset: 43f9351c7f6f --- indra/newview/llinventorymodel.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/llinventorymodel.h') diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 576c5e9e20..01e0ed7e9b 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 mLastItem; // cache recent lookups -- cgit v1.2.3 From 4dd88ee738da3851d4cf5f8ffc3058948076c53d Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 1 Aug 2018 17:41:34 +0300 Subject: MAINT-8803 Better UI handling of unrecognized inventory items --- indra/newview/llinventorymodel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llinventorymodel.h') diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 01e0ed7e9b..a4326aaeed 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -613,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, -- cgit v1.2.3