summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-02-10 01:52:08 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2012-02-10 01:52:08 +0200
commitb47994601bfd2bc240434eab4e3a255c38d535d1 (patch)
treee8c817cae9a23a901c20ab205db2d607b5e14e80 /indra/newview
parent8e60cdb3335ec198c71b29d37ab08c4aff9f8223 (diff)
MAINT-784 FIXED the inventory filter to be restarted when switching from 'Since Logoff' to 'Hours Ago' or 'Days Ago'.
Fix: checking for !isSinceLogoff() ensures that the time filter increases from zero and becomes more restrictive. This happens because setting 'Since Logoff' resets the 'Hours Ago' and 'Days Ago' to zero.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventoryfilter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index d54bce4619..0485b04895 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -502,7 +502,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);