summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.h
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-06-17 11:37:21 -0400
committerKent Quirk <q@lindenlab.com>2010-06-17 11:37:21 -0400
commit4bf8a0c7fca329ce1d0c58bc3ebf86fbbe544d40 (patch)
tree11c6e9bdeee80d486445ea301e97742c00cdff7a /indra/newview/llpanelmaininventory.h
parent59cc637b8df9b189b2c43e2fcf588c977580f820 (diff)
parent7cc006347822a70f36175dc2627814a0eaeb9c0a (diff)
Merge (and resolve conflict) from q/viewer-release
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
-rw-r--r--indra/newview/llpanelmaininventory.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 5a068373f5..82b72ac224 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -84,6 +84,7 @@ public:
void setSelectCallback(const LLFolderView::signal_t::slot_type& cb);
+ void onFilterEdit(const std::string& search_string );
protected:
//
// Misc functions
@@ -98,7 +99,7 @@ protected:
void onClearSearch();
static void onFoldersByName(void *user_data);
static BOOL checkFoldersByName(void *user_data);
- void onFilterEdit(const std::string& search_string );
+
static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward);
void onFilterSelected();