From 7bbc5cdea6beb4e05c26d1472f789fe6fa536ee3 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 12 Aug 2009 19:03:20 +0000 Subject: svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-34223 : AVP Current Outfit Folder For DEV-37485 : AVP Appearance Side Panel For DEV-35335 : AVP Automatic Folder Classification This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team. --- indra/newview/llfloaterinventory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterinventory.cpp') diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index 33a99facad..718719fe57 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -1274,9 +1274,9 @@ void LLInventoryPanel::draw() LLPanel::draw(); } -void LLInventoryPanel::setFilterTypes(U32 filter_types) +void LLInventoryPanel::setFilterTypes(U64 filter_types, BOOL filter_for_categories) { - mFolders->getFilter()->setFilterTypes(filter_types); + mFolders->getFilter()->setFilterTypes(filter_types, filter_for_categories); } void LLInventoryPanel::setFilterPermMask(PermissionMask filter_perm_mask) -- cgit v1.2.3