summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelcontents.h
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-09-28 18:01:02 +0800
committerErik Kundiman <erik@megapahit.org>2024-10-18 18:38:25 +0800
commitad3cbb9f75c4ea7f0473225afc034c403b54fc82 (patch)
tree4e4239e97a405d2820e26a4f2215ad8ccb88af7e /indra/newview/llpanelcontents.h
parent7fdb350e487acc35b26de6e243ff27f94185d3a5 (diff)
parent64c055f9be03861661f8c211ae36ba0db489b12d (diff)
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/llpanelcontents.h')
-rw-r--r--indra/newview/llpanelcontents.h10
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;
};