diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-19 16:51:44 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-19 16:51:44 -0700 |
| commit | 2cc1fb250f78df3a4b8f33b13b30defef7efb78a (patch) | |
| tree | 3090305f95c8c564913579a407749544a7f712d2 /indra/newview/llinventoryfilter.cpp | |
| parent | 03ad10d258095487d6ae8f26634932bc832f10df (diff) | |
CHUI-849 : Use a time limit for filtering instead of number limit, use a different limit for visible and unvisible lists
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 3b712925e1..3c6974cf6d 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -70,8 +70,7 @@ LLInventoryFilter::LLInventoryFilter(const Params& p) mFilterSubString(p.substring), mCurrentGeneration(0), mFirstRequiredGeneration(0), - mFirstSuccessGeneration(0), - mFilterCount(0) + mFirstSuccessGeneration(0) { // copy mFilterOps into mDefaultFilterOps markDefault(); @@ -1012,25 +1011,6 @@ LLInventoryFilter::EFolderShow LLInventoryFilter::getShowFolderState() const return mFilterOps.mShowFolderState; } -void LLInventoryFilter::setFilterCount(S32 count) -{ - mFilterCount = count; -} -S32 LLInventoryFilter::getFilterCount() const -{ - return mFilterCount; -} - -void LLInventoryFilter::decrementFilterCount() -{ - mFilterCount--; -} - -void LLInventoryFilter::incrementFilterCount() -{ - mFilterCount++; -} - bool LLInventoryFilter::isTimedOut() { return mFilterTime.hasExpired(); @@ -1038,15 +1018,12 @@ bool LLInventoryFilter::isTimedOut() void LLInventoryFilter::resetTime(S32 timeout) { - mFilterCount = 0; mFilterTime.reset(); F32 time_in_sec = (F32)(timeout)/1000.0; mFilterTime.setTimerExpirySec(time_in_sec); } - - -S32 LLInventoryFilter::getCurrentGeneration() const +S32 LLInventoryFilter::getCurrentGeneration() const { return mCurrentGeneration; } |
