aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llinventoryview.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-01-18 14:58:20 -0700
committerMcCabe Maxsted2009-01-18 14:58:20 -0700
commit14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d (patch)
tree7df321866ff9ccc352918e925bf37ab4a4bc8c06 /linden/indra/newview/llinventoryview.h
parentRemoved/moved unnecessary options (diff)
parentMerge branch 'filter-fixes' into next (diff)
downloadmeta-impy-14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d.zip
meta-impy-14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d.tar.gz
meta-impy-14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d.tar.bz2
meta-impy-14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d.tar.xz
merged in jacek's fixes for inv icons
Diffstat (limited to 'linden/indra/newview/llinventoryview.h')
-rw-r--r--linden/indra/newview/llinventoryview.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index 80e5768..c5c8532 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -162,14 +162,18 @@ public:
162 LLInventoryViewFinder(const std::string& name, 162 LLInventoryViewFinder(const std::string& name,
163 const LLRect& rect, 163 const LLRect& rect,
164 LLInventoryView* inventory_view); 164 LLInventoryView* inventory_view);
165 virtual void draw(); 165 virtual void rebuildFilter();
166 virtual void onClose(bool app_quitting); 166 virtual void onClose(bool app_quitting);
167 void changeFilter(LLInventoryFilter* filter); 167 void changeFilter(LLInventoryFilter* filter);
168 void updateElementsFromFilter(); 168 void updateElementsFromFilter();
169 BOOL getCheckShowEmpty(); 169 BOOL getCheckShowEmpty();
170 BOOL getCheckSinceLogoff(); 170 BOOL getCheckSinceLogoff();
171 171
172 /** Callback when an inventory type checkbox is changed. */
173 static void onCheckFilterType(LLUICtrl *ctrl, void *user_data);
174
172 static void onTimeAgo(LLUICtrl*, void *); 175 static void onTimeAgo(LLUICtrl*, void *);
176 static void onCheckShowEmptyFolders(LLUICtrl*, void *);
173 static void onCheckSinceLogoff(LLUICtrl*, void *); 177 static void onCheckSinceLogoff(LLUICtrl*, void *);
174 static void onCloseBtn(void* user_data); 178 static void onCloseBtn(void* user_data);
175 static void selectAllTypes(void* user_data); 179 static void selectAllTypes(void* user_data);