diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-16 20:39:40 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-16 20:39:40 +0000 |
| commit | 5e9e67cb2d1d3dfc82dfe96103270b2341991ddd (patch) | |
| tree | 2df2a064523b2bffef6ff7566399c76b1f2cc196 /indra/newview/llfolderview.cpp | |
| parent | 1ada34fc0c5dc20bffba231ef513b569dbec32ea (diff) | |
merge -r 59028:59178 maintenance -> release.
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 0dc7daa587..5f37d756fe 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -4449,14 +4449,15 @@ std::string::size_type LLInventoryFilter::getStringMatchOffset() const return mSubStringMatchOffset; } +// has user modified default filter params? BOOL LLInventoryFilter::isActive() { - return mFilterOps.mFilterTypes != 0xffffffff + return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes || mFilterSubString.size() - || mFilterOps.mPermissions != PERM_NONE - || mFilterOps.mMinDate != 0 - || mFilterOps.mMaxDate != U32_MAX - || mFilterOps.mHoursAgo != 0; + || mFilterOps.mPermissions != mDefaultFilterOps.mPermissions + || mFilterOps.mMinDate != mDefaultFilterOps.mMinDate + || mFilterOps.mMaxDate != mDefaultFilterOps.mMaxDate + || mFilterOps.mHoursAgo != mDefaultFilterOps.mHoursAgo; } BOOL LLInventoryFilter::isModified() |