diff options
Diffstat (limited to 'linden/indra/newview/llinventoryview.h')
-rw-r--r-- | linden/indra/newview/llinventoryview.h | 7 |
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; | |||
58 | class LLSpinCtrl; | 58 | class LLSpinCtrl; |
59 | class LLScrollableContainerView; | 59 | class LLScrollableContainerView; |
60 | class LLTextBox; | 60 | class LLTextBox; |
61 | class LLComboBox; | ||
61 | class LLIconCtrl; | 62 | class LLIconCtrl; |
62 | class LLSaveFolderState; | 63 | class LLSaveFolderState; |
63 | class LLSearchEditor; | 64 | class 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 | ||
260 | protected: | 263 | protected: |
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 | ||
351 | std::string get_item_icon_name(LLInventoryType::NType inv_ntype, | ||
352 | BOOL item_is_multi ); | ||
353 | |||
347 | LLUIImagePtr get_item_icon(LLAssetType::EType asset_type, | 354 | LLUIImagePtr 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, |