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

STORM-2034 Add a constant, try to fix some datetime logic filtering errors

meow-7.2.2
Jonathan Yap 2014-06-06 16:23:20 -04:00
parent 89837f3852
commit f759b3b912
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llinventoryfilter.cpp
View File

@ -223,7 +223,7 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
earliest = 0;
}
if (FILTER_YOUNGER == mFilterOps.mDateSearchDirection)
if (FILTER_YOUNGER == mFilterOps.mDateSearchDirection || isSinceLogoff())
{
if (listener->getCreationDate() < earliest ||
listener->getCreationDate() > mFilterOps.mMaxDate)
@ -641,6 +641,8 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
{
if (mFilterOps.mHoursAgo != hours)
{
const U32 FILTER_NEWER = 1;
bool are_date_limits_valid = mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max();
bool is_increasing = hours > mFilterOps.mHoursAgo;
@ -650,8 +652,8 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
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 older than search
if (0 == mFilterOps.mDateSearchDirection)
// Toggle for newer than search
if (FILTER_NEWER == mFilterOps.mDateSearchDirection)
{
less_restrictive = !less_restrictive;
more_restrictive = !more_restrictive;