livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Richard Linden 2014-04-07 14:17:39 -07:00
parent 4c3c4e84b2 c9c782b596
commit 29840c0c56
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llinventoryfilter.cpp
View File

@ -938,7 +938,10 @@ void LLInventoryFilter::toParams(Params& params) const
{
params.filter_ops.types = getFilterObjectTypes();
params.filter_ops.category_types = getFilterCategoryTypes();
params.filter_ops.wearable_types = getFilterWearableTypes();
if (getFilterObjectTypes() & FILTERTYPE_WEARABLE)
{
params.filter_ops.wearable_types = getFilterWearableTypes();
}
params.filter_ops.date_range.min_date = getMinDate();
params.filter_ops.date_range.max_date = getMaxDate();
params.filter_ops.hours_ago = getHoursAgo();
@ -957,7 +960,10 @@ void LLInventoryFilter::fromParams(const Params& params)
setFilterObjectTypes(params.filter_ops.types);
setFilterCategoryTypes(params.filter_ops.category_types);
setFilterWearableTypes(params.filter_ops.wearable_types);
if (params.filter_ops.wearable_types.isProvided())
{
setFilterWearableTypes(params.filter_ops.wearable_types);
}
setDateRange(params.filter_ops.date_range.min_date, params.filter_ops.date_range.max_date);
setHoursAgo(params.filter_ops.hours_ago);
setShowFolderState(params.filter_ops.show_folder_state);