diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
| commit | 74d4f8af01358c0975351f90f044c03bc9c50c4c (patch) | |
| tree | 72b8f043cd5787409718d1ca7be21ec32cf10657 /indra/newview/llinventoryfilter.cpp | |
| parent | 52411f83a1e92d8449f68a6528f5b78e7c391553 (diff) | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
v-r to drano merge conflicts wip
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); |