diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-29 12:42:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-29 12:42:53 -0400 |
| commit | 81870e09c98da59bf64289e3fe46f4e4281876d3 (patch) | |
| tree | d9e1a28b3e0e732c6b32d2ea67f5f56de6bc8a7a /indra/newview/llinventoryfilter.cpp | |
| parent | b2baee8e34a141c28fd2a7b60566558c1019c0a9 (diff) | |
| parent | 5db5102fe05f7d2ef3535516da269abb276dad6b (diff) | |
merge changes for DRTVWR-148
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 4d0af94f9f..4573074c73 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -654,7 +654,7 @@ 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_increasing_from_zero = is_increasing && !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); |