Merge brad/2549-downrez-controls into release/2024.09-ExtraFPS (#2864)

1 files changed, 7 insertions, 3 deletions

diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h
index 748bb76a82..bb6308e8b8 100644
--- a/indra/newview/llpanelcontents.h
+++ b/indra/newview/llpanelcontents.h
@@ -27,12 +27,13 @@
 #ifndef LL_LLPANELCONTENTS_H
 #define LL_LLPANELCONTENTS_H
 
-#include "v3math.h"
-#include "llpanel.h"
+#include "llfolderview.h"
 #include "llinventory.h"
+#include "llpanel.h"
 #include "lluuid.h"
 #include "llviewerobject.h"
 #include "llvoinventorylistener.h"
+#include "v3math.h"
 
 class LLButton;
 class LLPanelObjectInventory;
@@ -66,9 +67,12 @@ public:
     static const char* PERMS_ANYONE_CONTROL_KEY;
 
 protected:
-    void                getState(LLViewerObject *object);
+    void getState(LLViewerObject *object);
+    void onFilterEdit();
 
 public:
+    class LLFilterEditor* mFilterEditor;
+    LLSaveFolderState mSavedFolderState;
     LLPanelObjectInventory* mPanelInventoryObject;
 };