f

indra/newview/llinventoryview.h

@@ -59,6 +59,7 @@ class LLCheckBoxCtrl;
 class LLSpinCtrl;
 class LLScrollableContainerView;
 class LLTextBox;
+class LLComboBox;
 class LLIconCtrl;
 class LLSaveFolderState;
 class LLSearchEditor;
@@ -100,6 +101,12 @@ public:
 								   EAcceptance* accept,
 								   std::string& tooltip_msg);
 
+	//fix to get rid of gSavedSettings use - rkeast
+	void setPartialSearch(bool toggle);
+	bool getPartialSearch();
+	void setSearchType(U32 type);
+	U32 getSearchType();
+
 	// Call this method to set the selection.
 	void openAllFolders();
 	void closeAllFolders();
@@ -229,7 +236,35 @@ public:
 	static void toggleVisibility();
 	static void toggleVisibility(void*) { toggleVisibility(); }
 
-	// Final cleanup, destroy all open inventory views.
+	
+
+
+	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Final cleanup, destroy all open inventory views.
 	static void cleanup();
 
 	// LLView & LLFloater functionality
@@ -253,6 +288,10 @@ public:
 	static void onFoldersByName(void *user_data);
 	static BOOL checkFoldersByName(void *user_data);
 	static void onSearchEdit(const std::string& search_string, void* user_data );
+
+    static void onQuickFilterCommit(LLUICtrl* ctrl, void* user_data);
+    static void refreshQuickFilter(LLUICtrl* ctrl);
+
 	static void onFilterSelected(void* userdata, bool from_click);
 	static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
 
@@ -274,13 +313,16 @@ protected:
 
 protected:
 	LLSearchEditor*				mSearchEditor;
+	LLComboBox*					mQuickFilterCombo;
 	LLTabContainer*				mFilterTabs;
-	LLHandle<LLFloater>				mFinderHandle;
+	LLHandle<LLFloater>			mFinderHandle;
 	LLInventoryPanel*			mActivePanel;
 	LLSaveFolderState*			mSavedFolderState;
 
 	std::string					mFilterText;
 
+	S32							mItemCount;
+
 
 	// This container is used to hold all active inventory views. This
 	// is here to support the inventory toggle show button.