aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-15 14:49:09 -0600
committerJacek Antonelli2009-01-15 14:49:09 -0600
commit55b5f0c36b5d6448c6144cdd77ddee8273333b76 (patch)
treed8854310004e2d46e6974e20a273ff5fea9e61ed /linden/indra
parentDon't show empty folders when using filter. (diff)
downloadmeta-impy-55b5f0c36b5d6448c6144cdd77ddee8273333b76.zip
meta-impy-55b5f0c36b5d6448c6144cdd77ddee8273333b76.tar.gz
meta-impy-55b5f0c36b5d6448c6144cdd77ddee8273333b76.tar.bz2
meta-impy-55b5f0c36b5d6448c6144cdd77ddee8273333b76.tar.xz
LLInventoryViewFinder::rebuildFilter().
Refactored from draw().
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llinventoryview.cpp10
-rw-r--r--linden/indra/newview/llinventoryview.h1
2 files changed, 7 insertions, 4 deletions
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index d72fb95..4beb370 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -203,6 +203,12 @@ void LLInventoryViewFinder::updateElementsFromFilter()
203 203
204void LLInventoryViewFinder::draw() 204void LLInventoryViewFinder::draw()
205{ 205{
206 rebuildFilter();
207 LLFloater::draw();
208}
209
210void LLInventoryViewFinder::rebuildFilter()
211{
206 U32 filter = 0xffffffff; 212 U32 filter = 0xffffffff;
207 BOOL filtered_by_all_types = TRUE; 213 BOOL filtered_by_all_types = TRUE;
208 214
@@ -237,8 +243,6 @@ void LLInventoryViewFinder::draw()
237 } 243 }
238 244
239 if (!childGetValue("check_landmark")) 245 if (!childGetValue("check_landmark"))
240
241
242 { 246 {
243 filter &= ~(LLInventoryType::NIT_LANDMARK); 247 filter &= ~(LLInventoryType::NIT_LANDMARK);
244 filtered_by_all_types = FALSE; 248 filtered_by_all_types = FALSE;
@@ -308,8 +312,6 @@ void LLInventoryViewFinder::draw()
308 mInventoryView->mActivePanel->setHoursAgo(hours); 312 mInventoryView->mActivePanel->setHoursAgo(hours);
309 mInventoryView->mActivePanel->setSinceLogoff(getCheckSinceLogoff()); 313 mInventoryView->mActivePanel->setSinceLogoff(getCheckSinceLogoff());
310 mInventoryView->setFilterTextFromFilter(); 314 mInventoryView->setFilterTextFromFilter();
311
312 LLFloater::draw();
313} 315}
314 316
315void LLInventoryViewFinder::onClose(bool app_quitting) 317void LLInventoryViewFinder::onClose(bool app_quitting)
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index 80e5768..26f3003 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -163,6 +163,7 @@ public:
163 const LLRect& rect, 163 const LLRect& rect,
164 LLInventoryView* inventory_view); 164 LLInventoryView* inventory_view);
165 virtual void draw(); 165 virtual void draw();
166 virtual void rebuildFilter();
166 virtual void onClose(bool app_quitting); 167 virtual void onClose(bool app_quitting);
167 void changeFilter(LLInventoryFilter* filter); 168 void changeFilter(LLInventoryFilter* filter);
168 void updateElementsFromFilter(); 169 void updateElementsFromFilter();