Skip to content
Snippets Groups Projects
Commit c9c782b5 authored by Richard Linden's avatar Richard Linden
Browse files

MAINT-3915 FIX Recent Inventory Tab not showing Recent activity

old logic would interpret "don't care whether or not I am showing wearables" as "filter for just wearables, of any type"
parent 41d8db0d
No related branches found
No related tags found
No related merge requests found
...@@ -938,7 +938,10 @@ void LLInventoryFilter::toParams(Params& params) const ...@@ -938,7 +938,10 @@ void LLInventoryFilter::toParams(Params& params) const
{ {
params.filter_ops.types = getFilterObjectTypes(); params.filter_ops.types = getFilterObjectTypes();
params.filter_ops.category_types = getFilterCategoryTypes(); 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.min_date = getMinDate();
params.filter_ops.date_range.max_date = getMaxDate(); params.filter_ops.date_range.max_date = getMaxDate();
params.filter_ops.hours_ago = getHoursAgo(); params.filter_ops.hours_ago = getHoursAgo();
...@@ -957,7 +960,10 @@ void LLInventoryFilter::fromParams(const Params& params) ...@@ -957,7 +960,10 @@ void LLInventoryFilter::fromParams(const Params& params)
setFilterObjectTypes(params.filter_ops.types); setFilterObjectTypes(params.filter_ops.types);
setFilterCategoryTypes(params.filter_ops.category_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); setDateRange(params.filter_ops.date_range.min_date, params.filter_ops.date_range.max_date);
setHoursAgo(params.filter_ops.hours_ago); setHoursAgo(params.filter_ops.hours_ago);
setShowFolderState(params.filter_ops.show_folder_state); setShowFolderState(params.filter_ops.show_folder_state);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment