aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-14 20:53:55 -0600
committerJacek Antonelli2009-01-14 20:53:55 -0600
commitb6ff3724572f7ae614699fc98bd1de9fa367b76d (patch)
tree700e7875ee3c7fe4758c3c2233842e99dd18e194
parentAdded inventory ntype for folders. (diff)
downloadmeta-impy-b6ff3724572f7ae614699fc98bd1de9fa367b76d.zip
meta-impy-b6ff3724572f7ae614699fc98bd1de9fa367b76d.tar.gz
meta-impy-b6ff3724572f7ae614699fc98bd1de9fa367b76d.tar.bz2
meta-impy-b6ff3724572f7ae614699fc98bd1de9fa367b76d.tar.xz
Don't show empty folders when using filter.
This is the old behavior, but I had broken it.
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llinventoryview.cpp4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2941998..c948906 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-01-14 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-01-14 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/llinventoryview.cpp:
4 Don't show empty folders when using filter.
5 This is the old behavior, but I had broken it.
6
7
3 * linden/indra/llinventory/llinventorytype.h: 8 * linden/indra/llinventory/llinventorytype.h:
4 Added inventory ntype for folders. 9 Added inventory ntype for folders.
5 * linden/indra/llinventory/llinventory.cpp: 10 * linden/indra/llinventory/llinventory.cpp:
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 52c3b7e..d72fb95 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -280,13 +280,11 @@ void LLInventoryViewFinder::draw()
280 filtered_by_all_types = FALSE; 280 filtered_by_all_types = FALSE;
281 } 281 }
282 282
283 /*
284 if (!filtered_by_all_types) 283 if (!filtered_by_all_types)
285 { 284 {
286 // don't include folders in filter, unless I've selected everything 285 // don't include folders in filter, unless I've selected everything
287 filter &= ~(LLInventoryType::NIT_CATEGORY); 286 filter &= ~(LLInventoryType::NIT_FOLDER);
288 } 287 }
289 */
290 288
291 // update the panel, panel will update the filter 289 // update the panel, panel will update the filter
292 mInventoryView->mActivePanel->setShowFolderState(getCheckShowEmpty() ? 290 mInventoryView->mActivePanel->setShowFolderState(getCheckShowEmpty() ?