aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llinventoryview.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llinventoryview.h')
-rw-r--r--linden/indra/newview/llinventoryview.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index a37d370..80e5768 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -58,6 +58,7 @@ class LLCheckBoxCtrl;
58class LLSpinCtrl; 58class LLSpinCtrl;
59class LLScrollableContainerView; 59class LLScrollableContainerView;
60class LLTextBox; 60class LLTextBox;
61class LLComboBox;
61class LLIconCtrl; 62class LLIconCtrl;
62class LLSaveFolderState; 63class LLSaveFolderState;
63class LLSearchEditor; 64class LLSearchEditor;
@@ -239,6 +240,8 @@ public:
239 static void onFoldersByName(void *user_data); 240 static void onFoldersByName(void *user_data);
240 static BOOL checkFoldersByName(void *user_data); 241 static BOOL checkFoldersByName(void *user_data);
241 static void onSearchEdit(const std::string& search_string, void* user_data ); 242 static void onSearchEdit(const std::string& search_string, void* user_data );
243 static void onQuickFilterCommit(LLUICtrl* ctrl, void* user_data);
244 static void refreshQuickFilter(LLUICtrl* ctrl);
242 static void onFilterSelected(void* userdata, bool from_click); 245 static void onFilterSelected(void* userdata, bool from_click);
243 static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data); 246 static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
244 247
@@ -259,6 +262,7 @@ protected:
259 262
260protected: 263protected:
261 LLSearchEditor* mSearchEditor; 264 LLSearchEditor* mSearchEditor;
265 LLComboBox* mQuickFilterCombo;
262 LLTabContainer* mFilterTabs; 266 LLTabContainer* mFilterTabs;
263 LLHandle<LLFloater> mFinderHandle; 267 LLHandle<LLFloater> mFinderHandle;
264 LLInventoryPanel* mActivePanel; 268 LLInventoryPanel* mActivePanel;
@@ -344,6 +348,9 @@ std::string get_item_icon_name(LLAssetType::EType asset_type,
344 U32 attachment_point, 348 U32 attachment_point,
345 BOOL item_is_multi ); 349 BOOL item_is_multi );
346 350
351std::string get_item_icon_name(LLInventoryType::NType inv_ntype,
352 BOOL item_is_multi );
353
347LLUIImagePtr get_item_icon(LLAssetType::EType asset_type, 354LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
348 LLInventoryType::EType inventory_type, 355 LLInventoryType::EType inventory_type,
349 U32 attachment_point, 356 U32 attachment_point,