Merged lindenlab/viewer-release into default

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h
index 9eb74581a2..952e3a333a 100644
--- a/indra/newview/llpanelmarketplaceinbox.h
+++ b/indra/newview/llpanelmarketplaceinbox.h
@@ -28,7 +28,7 @@
 #define LL_LLPANELMARKETPLACEINBOX_H
 
 #include "llpanel.h"
-
+#include "llfolderview.h"
 class LLButton;
 class LLInventoryPanel;
 class LLUICtrl;
@@ -56,6 +56,9 @@ public:
 	
 	LLInventoryPanel * setupInventoryPanel();
 
+	void onClearSearch();
+	void onFilterEdit(const std::string& search_string);
+
 	U32 getFreshItemCount() const;
 	U32 getTotalItemCount() const;
 
@@ -71,6 +74,7 @@ private:
 	LLUICtrl *			mFreshCountCtrl;
 	LLButton *			mInboxButton;
 	LLInventoryPanel *	mInventoryPanel;
+	LLSaveFolderState*			mSavedFolderState;
 };