diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2014-06-10 13:06:53 -0400 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2014-06-10 13:06:53 -0400 |
| commit | 51aa604af4e8b3b7361c31dcf2578c8a42bf3b1e (patch) | |
| tree | 9be7600a059e3ba48262e39d85513345c5b2f87d | |
| parent | e856e10c7d06c8a19b9e12407f13900fee8b80c1 (diff) | |
STORM-2034 Try to fix incorrect logic about increasing and decreasing filtering.
Minor XML adjustment.
| -rwxr-xr-x | indra/newview/llinventoryfilter.cpp | 8 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index a3b2dd3366..1d788321b8 100755 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -642,17 +642,17 @@ void LLInventoryFilter::setHoursAgo(U32 hours) bool are_date_limits_valid = mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max(); bool is_increasing = hours > mFilterOps.mHoursAgo; + bool is_decreasing = hours < mFilterOps.mHoursAgo; bool is_increasing_from_zero = is_increasing && !mFilterOps.mHoursAgo && !isSinceLogoff(); // *NOTE: need to cache last filter time, in case filter goes stale BOOL less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours); BOOL more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero); - // Toggle for newer than search - if (FILTERDATEDIRECTION_NEWER == mFilterOps.mDateSearchDirection) + if (FILTERDATEDIRECTION_OLDER == mFilterOps.mDateSearchDirection) { - less_restrictive = !less_restrictive; - more_restrictive = !more_restrictive; + less_restrictive = (are_date_limits_valid && ((is_decreasing && mFilterOps.mHoursAgo)) || !hours); + more_restrictive = (are_date_limits_valid && (!is_decreasing && hours) || is_increasing_from_zero); } mFilterOps.mHoursAgo = hours; diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index d2519a5aa4..06d0b849a3 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -63,7 +63,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Show Filters" + label="Show Filters..." layout="topleft" name="show_filters"> <on_click |