diff options
| author | Richard Linden <none@none> | 2012-02-23 12:39:59 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-23 12:39:59 -0800 |
| commit | 48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (patch) | |
| tree | ec895147f9ccd201203e9b23433b9bb921278f03 /indra/newview/llinventoryfilter.cpp | |
| parent | 11d29660aa84a1a8a61e427698715497a57243c2 (diff) | |
| parent | 9da67fff0a21ae7af2f99c90be267b089eaafeb6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 5496c273f2..947f74315c 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -150,7 +150,7 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const { return true; } - + if (mFilterOps.mFilterTypes & FILTERTYPE_CATEGORY) { // Can only filter categories for items in your inventory @@ -558,8 +558,14 @@ void LLInventoryFilter::setDateRange(time_t min_date, time_t max_date) setModified(); } - areDateLimitsSet() ? mFilterOps.mFilterTypes |= FILTERTYPE_DATE - : mFilterOps.mFilterTypes &= ~FILTERTYPE_DATE; + if (areDateLimitsSet()) + { + mFilterOps.mFilterTypes |= FILTERTYPE_DATE; + } + else + { + mFilterOps.mFilterTypes &= ~FILTERTYPE_DATE; + } } void LLInventoryFilter::setDateRangeLastLogoff(BOOL sl) @@ -575,8 +581,14 @@ void LLInventoryFilter::setDateRangeLastLogoff(BOOL sl) setModified(); } - areDateLimitsSet() ? mFilterOps.mFilterTypes |= FILTERTYPE_DATE - : mFilterOps.mFilterTypes &= ~FILTERTYPE_DATE; + if (areDateLimitsSet()) + { + mFilterOps.mFilterTypes |= FILTERTYPE_DATE; + } + else + { + mFilterOps.mFilterTypes &= ~FILTERTYPE_DATE; + } } BOOL LLInventoryFilter::isSinceLogoff() const @@ -622,8 +634,14 @@ void LLInventoryFilter::setHoursAgo(U32 hours) } } - areDateLimitsSet() ? mFilterOps.mFilterTypes |= FILTERTYPE_DATE - : mFilterOps.mFilterTypes &= ~FILTERTYPE_DATE; + if (areDateLimitsSet()) + { + mFilterOps.mFilterTypes |= FILTERTYPE_DATE; + } + else + { + mFilterOps.mFilterTypes &= ~FILTERTYPE_DATE; + } } void LLInventoryFilter::setFilterLinks(U64 filter_links) |