summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2014-06-10 17:23:48 -0400
committerJonathan Yap <jhwelch@gmail.com>2014-06-10 17:23:48 -0400
commit078941c4a43289e35c9e8f0f566a6e55941592fb (patch)
tree818a920f4cc4374b10eebc3fbf33f395db5ec8c5
parent51aa604af4e8b3b7361c31dcf2578c8a42bf3b1e (diff)
STORM-2034 Made small coding change per Oz's request
-rwxr-xr-xindra/newview/llinventoryfilter.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 1d788321b8..0bbb4aeeff 100755
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -646,10 +646,14 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
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);
-
- if (FILTERDATEDIRECTION_OLDER == mFilterOps.mDateSearchDirection)
+ BOOL less_restrictive;
+ BOOL more_restrictive;
+ if (FILTERDATEDIRECTION_NEWER == mFilterOps.mDateSearchDirection)
+ {
+ less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours);
+ more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero);
+ }
+ else
{
less_restrictive = (are_date_limits_valid && ((is_decreasing && mFilterOps.mHoursAgo)) || !hours);
more_restrictive = (are_date_limits_valid && (!is_decreasing && hours) || is_increasing_from_zero);