From 238a2a64b31e6a0b431309e363067a7fe57125ae Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 4 Sep 2024 13:42:11 +0300
Subject: viewer#2411 Use font buffer in text segments

---
 indra/newview/llpanelmaininventory.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llpanelmaininventory.h')

diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 3347ab904b..d28daddd73 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -196,9 +196,10 @@ private:
     LLSaveFolderState*          mSavedFolderState;
     std::string                 mFilterText;
     std::string                 mFilterSubString;
-    S32                         mItemCount;
+    S32                         mItemCount = 0;
+    std::string                 mLastFilterText;
     std::string                 mItemCountString;
-    S32                         mCategoryCount;
+    S32                         mCategoryCount = 0;
     std::string                 mCategoryCountString;
     LLComboBox*                 mSearchTypeCombo;
 
-- 
cgit v1.2.3


From 3c471b81554d9727b1a1929681ce3bfb4734aabc Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 6 Sep 2024 02:20:10 +0200
Subject: Follow-up fix for 238a2a64b31e6a0b431309e363067a7fe57125ae: Item
 count will always show fetch label even after fetch is complete

---
 indra/newview/llpanelmaininventory.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/llpanelmaininventory.h')

diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index d28daddd73..21100cc03c 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -182,6 +182,13 @@ protected:
     LLSidepanelInventory* getParentSidepanelInventory();
 
 private:
+    enum class EFetchState
+    {
+        Unknown,
+        Fetching,
+        Complete
+    };
+
     LLFloaterInventoryFinder* getFinder();
 
     LLFilterEditor*             mFilterEditor;
@@ -202,6 +209,7 @@ private:
     S32                         mCategoryCount = 0;
     std::string                 mCategoryCountString;
     LLComboBox*                 mSearchTypeCombo;
+    EFetchState                 mLastFetchState{ EFetchState::Unknown };
 
     LLButton* mBackBtn;
     LLButton* mForwardBtn;
-- 
cgit v1.2.3


From 2b7b81fbdbaaaa8698828af9529f9693692da2a2 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 3 Sep 2024 18:05:45 +0200
Subject: #459 Filters on object inventory

---
 indra/newview/llpanelmaininventory.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llpanelmaininventory.h')

diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 21100cc03c..a78c0c0fad 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -103,7 +103,7 @@ public:
 
     void onFilterEdit(const std::string& search_string );
 
-    void setFocusFilterEditor();
+    void setFocusOnFilterEditor();
 
     static LLFloaterSidePanelContainer* newWindow();
     static void newFolderWindow(LLUUID folder_id = LLUUID(), LLUUID item_to_select = LLUUID());
-- 
cgit v1.2.3